CONFLICT RESOLUTION (view entire LOG message to see):

GAMEMANAGER. we did different fixes. I merged the best of both ;)
EZ2DANCER columns now aligned correctly
EZ2DANCER stage screen stylization now underway
NOTE: This Release WILL NOT COMPILE. Some Members of RAGELOG and RAGESOUND have disappeared, and I don't know where to.

stepmania/src/SongManager.cpp

@@ -423,7 +423,7 @@ void SongManager::InitCoursesFromDisk()
 	//
 	// Load extra stages
 	//
-	for( int g=0; g<saGroupNames.GetSize(); g++ )	// foreach Group
+	for( g=0; g<saGroupNames.GetSize(); g++ )	// foreach Group
 	{
 		CString sGroupName = saGroupNames[g];
 		CStringArray saCourseFiles;