Merge remote-tracking branch 'origin/next' into dvogonen/making_settings_type_safe

2014-02-21 07:38:30 +01:00
parent 08245aade9 b30cf3ee0e
commit 576682f6a8
3 changed files with 4 additions and 2 deletions
@@ -1,2 +1,2 @@
-/.project
+/.*project
 /.settings
@@ -324,3 +324,4 @@ Leonard MacKey
 Reginald H Millsom
 Emanuel Stassar
 Pierluigi Sommaruga
+Rafael Eric Suarez Nordlow
@@ -6,11 +6,12 @@
 /simu.d
 /snapshot_*.png
 /*.sh
+/*.bat
 /*.o
 /*.bin
 /*.bin.*
 /*.lst
 /SCRIPTS
+/TEMPLATES
 /SOUNDS
 /LOGS
-/*.bat