Merge branch 'master' into dev

2013-06-17 08:32:02 +10:00
parent 7fef2501a3 9599d82db3
commit 752dcadfa1
1 changed files with 3 additions and 0 deletions
@@ -12,6 +12,9 @@ Out/
 #Project generated files
 *.db
 *.o
 *.a
 *.exe
 #Shell files
 *.bat