Author: cazfi
Date: Fri Aug 14 19:05:53 2015
New Revision: 29504

URL: http://svn.gna.org/viewcvs/freeciv?rev=29504&view=rev
Log:
Removed GUI_XAW gui_type definition

See patch #6223

Modified:
    trunk/client/tilespec.c
    trunk/common/fc_types.h
    trunk/fc_version

Modified: trunk/client/tilespec.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/tilespec.c?rev=29504&r1=29503&r2=29504&view=diff
==============================================================================
--- trunk/client/tilespec.c     (original)
+++ trunk/client/tilespec.c     Fri Aug 14 19:05:53 2015
@@ -5973,7 +5973,6 @@
     default_theme_name_sz = sizeof(options.gui_sdl_default_theme_name);
     break;
   case GUI_STUB:
-  case GUI_XAW:
   case GUI_QT:
   case GUI_WEB:
     break;

Modified: trunk/common/fc_types.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/fc_types.h?rev=29504&r1=29503&r2=29504&view=diff
==============================================================================
--- trunk/common/fc_types.h     (original)
+++ trunk/common/fc_types.h     Fri Aug 14 19:05:53 2015
@@ -477,14 +477,12 @@
 #define SPECENUM_VALUE2NAME "gtk3"
 #define SPECENUM_VALUE3 GUI_SDL
 #define SPECENUM_VALUE3NAME "sdl"
-#define SPECENUM_VALUE4 GUI_XAW
-#define SPECENUM_VALUE4NAME "xaw"
-#define SPECENUM_VALUE5 GUI_QT
-#define SPECENUM_VALUE5NAME "qt"
-#define SPECENUM_VALUE6 GUI_SDL2
-#define SPECENUM_VALUE6NAME "sdl2"
-#define SPECENUM_VALUE7 GUI_WEB
-#define SPECENUM_VALUE7NAME "web"
+#define SPECENUM_VALUE4 GUI_QT
+#define SPECENUM_VALUE4NAME "qt"
+#define SPECENUM_VALUE5 GUI_SDL2
+#define SPECENUM_VALUE5NAME "sdl2"
+#define SPECENUM_VALUE6 GUI_WEB
+#define SPECENUM_VALUE6NAME "web"
 #include "specenum_gen.h"
 
 /* Used in the network protocol. */

Modified: trunk/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=29504&r1=29503&r2=29504&view=diff
==============================================================================
--- trunk/fc_version    (original)
+++ trunk/fc_version    Fri Aug 14 19:05:53 2015
@@ -54,7 +54,7 @@
 #   - Avoid adding a new mandatory capability to the development branch for
 #     as long as possible.  We want to maintain network compatibility with
 #     the stable branch for as long as possible.
-NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2015.Aug.14"
+NETWORK_CAPSTRING_MANDATORY="+Freeciv.Devel-3.0-2015.Aug.14b"
 NETWORK_CAPSTRING_OPTIONAL=""
 
 FREECIV_DISTRIBUTOR=""


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to