Merge branch 'master' of https://github.com/vyhd/openitg
authorMarc Cannon <vyhdycokio@gmail.com>
Tue, 15 Jan 2013 17:37:17 +0000 (17:37 +0000)
committerMarc Cannon <vyhdycokio@gmail.com>
Tue, 15 Jan 2013 17:37:17 +0000 (17:37 +0000)
commit2f7ed3b5676ad661fe6fc64055af6966c2837d6f
treeef4ad2050a8715338b5610b94f0b3ace2731a6e3
parent67b49db5e82865aa1bb0329d6ed43a6df4fdd043
parent4e8c70258b2bf8a6cb958c28ae62231d62c2f6ad
Merge branch 'master' of https://github.com/vyhd/openitg

Conflicts:
autogen.sh
configure.ac
src/DiagnosticsUtil.cpp
src/NetworkSyncManager.cpp
src/ProductInfo.cpp
src/ProductInfo.h
src/RageFileManager.cpp
src/ScreenTitleMenu.cpp
src/SongManager.cpp
src/StepMania.cpp
src/arch/Lights/LightsDriver.cpp
src/archutils/Unix/CrashHandlerChild.cpp
src/archutils/Win32/Crash.cpp
src/DiagnosticsUtil.cpp
src/Makefile.am
src/ProductInfo.cpp
src/ProductInfo.h
src/Profile.cpp
src/RageFileManager.cpp
src/Song.cpp
src/SongManager.cpp
src/StepMania.cpp
src/arch/Lights/LightsDriver.cpp
src/archutils/Win32/Crash.cpp