THIS IS MERGE

2011-02-26 01:19:54 +07:00
parent 686869f0a3 054ead23d6
commit 37384c9f2f
153 changed files with 3635 additions and 1818 deletions
@@ -48,6 +48,7 @@ nsis_strings_temp.inc
 Data/SpeedMods.txt
 Program/StepMania*.lib
 crashinfo.txt
+Utils/temp*

 syntax: regexp
 .*\#.*\#$