merge

src/Makefile.am

@@ -603,8 +603,8 @@ libtomcrypt_a_CPPFLAGS = -I$(srcdir)/libtomcrypt/src/headers $(AM_CPPFLAGS)
 
 noinst_LIBRARIES += libtomcrypt.a
 
-main_CPPFLAGS = -I$(top_srcdir)/extern/jsoncpp/include \
--I$(top_srcdir)/extern/glew-1.5.8/include
+main_CPPFLAGS = -I$(top_srcdir)/extern/jsoncpp/include
+#-I$(top_srcdir)/extern/glew-1.5.8/include
 
 main_SOURCES = $(PNG) \
 		$(Screens) \

src/ScreenEdit.cpp

@@ -1841,7 +1841,7 @@ void ScreenEdit::InputEdit( const InputEventPlus &input, EditButton EditB )
 				SWITCHED_TO.GetValue() + " %s %s '%s' (%d of %d)",
 				GAMEMAN->GetStepsTypeInfo( pSteps->m_StepsType ).szName,
 				DifficultyToString( pSteps->GetDifficulty() ).c_str(),
-				pSteps->GetDescription().c_str(),
+				pSteps->GetChartName().c_str(),
 				it - vSteps.begin() + 1,
 				int(vSteps.size()) );
 			SCREENMAN->SystemMessage( s );