Merge branch 'master' into develop

2015-05-18 21:29:15 +10:00
parent 822d0636cc a8cf0a6947
commit 68429806d1
1 changed files with 3 additions and 0 deletions
@@ -9,6 +9,9 @@
 Release/
 Debug/
 Out/
+release/
+debug/
+out/

 #Project generated files
 *.db