Author: cazfi
Date: Sun Jan  3 00:59:14 2016
New Revision: 31321

URL: http://svn.gna.org/viewcvs/freeciv?rev=31321&view=rev
Log:
Updated comment talking about Conflicting Bases to say Conflicting Extras in 
general

Modified:
    branches/S2_6/client/gui-gtk-2.0/helpdlg.c
    branches/S2_6/client/gui-gtk-3.0/helpdlg.c

Modified: branches/S2_6/client/gui-gtk-2.0/helpdlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/helpdlg.c?rev=31321&r1=31320&r2=31321&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-2.0/helpdlg.c  (original)
+++ branches/S2_6/client/gui-gtk-2.0/helpdlg.c  Sun Jan  3 00:59:14 2016
@@ -1257,7 +1257,7 @@
       sprintf(buf, "-");
     }
     gtk_label_set_text(GTK_LABEL(help_elabel[1]), buf);
-    /* Conflicting bases */
+    /* Conflicting extras */
     buf[0] = '\0';
     extra_type_iterate(pextra2) {
       if (!can_extras_coexist(pextra, pextra2)) {

Modified: branches/S2_6/client/gui-gtk-3.0/helpdlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/helpdlg.c?rev=31321&r1=31320&r2=31321&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/helpdlg.c  (original)
+++ branches/S2_6/client/gui-gtk-3.0/helpdlg.c  Sun Jan  3 00:59:14 2016
@@ -1284,7 +1284,7 @@
       sprintf(buf, "-");
     }
     gtk_label_set_text(GTK_LABEL(help_elabel[1]), buf);
-    /* Conflicting bases */
+    /* Conflicting extras */
     buf[0] = '\0';
     extra_type_iterate(pextra2) {
       if (!can_extras_coexist(pextra, pextra2)) {


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

Reply via email to