Merge branch 'dev' into dev-physfs

Conflicts:
	data
	src/app/gamedata.cpp
	src/ui/control.cpp
	src/ui/edit.cpp
	src/ui/maindialog.cpp

1 files changed, 0 insertions, 18 deletions

diff --git a/src/common/misc.cpp b/src/common/misc.cpp
index 65689e6..92c3e9a 100644
--- a/src/common/misc.cpp
+++ b/src/common/misc.cpp
@@ -192,18 +192,6 @@ void TimeToAscii(time_t time, char *buffer)
     year = when.tm_year+1900;
     if ( year < 2000 )  year -= 1900;
     else                year -= 2000;
-/* TODO
-#if _FRENCH
-    sprintf(buffer, "%.2d.%.2d.%.2d %.2d:%.2d",
-                    when.tm_mday, when.tm_mon+1, year,
-                    when.tm_hour, when.tm_min);
-#endif
-#if _GERMAN | _WG
-    sprintf(buffer, "%.2d.%.2d.%.2d %.2d:%.2d",
-                    when.tm_mday, when.tm_mon+1, year,
-                    when.tm_hour, when.tm_min);
-#endif
-#if _ENGLISH*/
     char        format[10];
     int         hour;
 
@@ -222,12 +210,6 @@ void TimeToAscii(time_t time, char *buffer)
     sprintf(buffer, "%.2d.%.2d.%.2d %.2d:%.2d %s",
                     when.tm_mon+1, when.tm_mday, year,
                     hour, when.tm_min, format);
-/*#endif
-#if _POLISH
-    sprintf(buffer, "%.2d.%.2d.%.2d %.2d:%.2d",
-                    when.tm_mday, when.tm_mon+1, year,
-                    when.tm_hour, when.tm_min);
-#endif*/
 }
 
 // Converting time to string.