Merge branch 'master' of https://github.com/trikset/trikRuntime into wpa

yurii-litvinov · yurii-litvinov · commit ddf3537769b8 · 2015-12-09T13:59:19.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -25,4 +25,8 @@ Makefile*
 bin/*
 /.project
 object_script.*.Debug
-object_script.*.Release
+object_script.*.Release
+
+# project-specific
+**/.build
+tests/minimalCppApp/*
