Merge remote-tracking branch 'origin/next' into bsongis/vario_improvements

This commit is contained in:
Bertrand Songis
2014-02-21 07:17:00 +01:00
2 changed files with 3 additions and 1 deletions
+1
View File
@@ -324,3 +324,4 @@ Leonard MacKey
Reginald H Millsom
Emanuel Stassar
Pierluigi Sommaruga
Rafael Eric Suarez Nordlow
+2 -1
View File
@@ -6,11 +6,12 @@
/simu.d
/snapshot_*.png
/*.sh
/*.bat
/*.o
/*.bin
/*.bin.*
/*.lst
/SCRIPTS
/TEMPLATES
/SOUNDS
/LOGS
/*.bat