Author: shadowmaster
Date: Fri Mar 27 00:38:26 2009
New Revision: 34173
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34173&view=rev
Log:
Port only r34170 and r34172 from 1.6 branch for now.
Modified:
trunk/src/game_config.cpp
trunk/src/game_config.hpp
Modified: trunk/src/game_config.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_config.cpp?rev=34173&r1=34172&r2=34173&view=diff
==============================================================================
--- trunk/src/game_config.cpp (original)
+++ trunk/src/game_config.cpp Fri Mar 27 00:38:26 2009
@@ -20,7 +20,6 @@
#include "gettext.hpp"
#include "log.hpp"
#include "util.hpp"
-#include "version.hpp"
#include "wesconfig.h"
#include "serialization/string_utils.hpp"
#ifdef HAVE_REVISION
Modified: trunk/src/game_config.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_config.hpp?rev=34173&r1=34172&r2=34173&view=diff
==============================================================================
--- trunk/src/game_config.hpp (original)
+++ trunk/src/game_config.hpp Fri Mar 27 00:38:26 2009
@@ -15,10 +15,10 @@
#define GAME_CONFIG_H_INCLUDED
class config;
-class version_info;
#include "color_range.hpp"
#include "tstring.hpp"
+#include "version.hpp"
#include <string>
#include <vector>
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
