Merge branch 'master' of https://github.com/stepmania/stepmania

.gitignore

@@ -1,103 +1,114 @@
-*.orig
-*.rej
-*~
-*.o
-tests/*.err
-ffmpeg-*
-*.ncb
-*.suo
-*.tlog
-*.lastbuildstate
-*.unsuccessfulbuild
-*.log
-*.ipch
-*.obj
-*.app
-*.dep
-*.idb
-*.pdb
-*.exp
-*.dmg
-*.orig
-*.sdf
-*.opensdf
-___*
-.hg
-.hgignore
-.hgtags
-.svn
-.cvsignore
-.DS_Store
-*.diff
-*.patch
-Thumbs.db
-GameData.smzip
-config.log
-config.status
-*.pbxuser
-*.user
-*.mode1v3
-*.exe
-*.vdi
-Makefile
-stepmania
-Makefile.in
-_build/*
-aclocal.m4
-autoconf/*
-autom4te.cache/*
-configure
-src/Makefile.in
-src/Makefile
-src/config.h
-src/config.h.in
-src/stamp-h1
-Docs/doxygen
-PBProject/build
-Xcode/build
-*.xcodeproj/xcuserdata
-*.xcodeproj/project.xcworkspace
-src/build-*
-src/Release-*
-src/libtomcrypt/build-*
-src/libtomcrypt/Release-*
-src/libtommath/build-*
-src/libtommath/Release-*
-src/*.old
-*/.deps
-*/.dirstamp
-src/*.a
-src/*.so
-GtkModule.so
-ver.cpp
-lib*_link.a
-Data/UserPrefs
-Data/uPrefs
-Data/GamePrefs/*.cfg
-Data/Static.ini
-PBProject/Hardware.plist
-Themes/pump
-Themes/pump-*
-Themes/optical-release
-Themes/moonlight
-Themes/ultralight
-Themes/test
-src/version.bin
-src/verstub.cpp
-Songs/*
-*.dmg
-.git
-*.smzip
-nsis_strings_temp.inc
-Data/SpeedMods.txt
-Program/StepMania*.lib
-crashinfo.txt
-Utils/temp*
-*.lnk
-BuildLog.htm
-*.pch
-Cache/
-Save/
-Logs/
-Screenshots/
-portable.ini
+.dirstamp
+.deps
+*.orig
+*.rej
+*~
+*.o
+tests/*.err
+ffmpeg-*
+*.ncb
+*.suo
+*.tlog
+*.lastbuildstate
+*.unsuccessfulbuild
+*.log
+*.ipch
+*.obj
+*.app
+*.dep
+*.idb
+*.pdb
+*.exp
+*.dmg
+*.orig
+*.sdf
+*.opensdf
+___*
+.hg
+.hgignore
+.hgtags
+.svn
+.cvsignore
+.DS_Store
+*.diff
+*.patch
+Thumbs.db
+GameData.smzip
+config.log
+config.status
+*.pbxuser
+*.user
+*.mode1v3
+*.exe
+*.vdi
+Makefile
+stepmania
+Makefile.in
+_build/*
+aclocal.m4
+autoconf/*
+autom4te.cache/*
+configure
+src/Makefile.in
+src/Makefile
+src/config.h
+src/config.h.in
+src/stamp-h1
+Docs/doxygen
+PBProject/build
+Xcode/build
+*.xcodeproj/xcuserdata
+*.xcodeproj/project.xcworkspace
+src/build-*
+src/Release-*
+src/libtomcrypt/build-*
+src/libtomcrypt/Release-*
+src/libtommath/build-*
+src/libtommath/Release-*
+src/*.old
+*/.deps
+*/.dirstamp
+src/*.a
+src/*.so
+GtkModule.so
+ver.cpp
+lib*_link.a
+Data/UserPrefs
+Data/uPrefs
+Data/GamePrefs/*.cfg
+Data/Static.ini
+PBProject/Hardware.plist
+Themes/pump
+Themes/pump-*
+Themes/optical-release
+Themes/moonlight
+Themes/ultralight
+Themes/test
+src/version.bin
+src/verstub.cpp
+Songs/*
+*.dmg
+.git
+*.smzip
+nsis_strings_temp.inc
+Data/SpeedMods.txt
+Program/StepMania*.lib
+crashinfo.txt
+Utils/temp*
+*.lnk
+BuildLog.htm
+*.pch
+Cache/
+Save/
+Logs/
+Screenshots/
+portable.ini
+*.sublime-project
+*.sublime-workspace
+*.xcscheme
+WorkspaceSettings.xcsettings
+UserInterfaceState.xcuserstate
+*.xccheckout
+contents.xcworkspacedata
+xcschememanagement.plist
+*.swp