[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src/widgets menu.hpp
From: |
Guillaume Melquiond |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src/widgets menu.hpp |
Date: |
Thu, 02 Dec 2004 17:08:58 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Guillaume Melquiond <address@hidden> 04/12/02 22:02:51
Modified files:
src/widgets : menu.hpp
Log message:
Argh, I completely address@hidden my previous commit, only help.cpp
should have been committed. No need to completely revert it though, since I
would have committed it later anyway. But let's at least revert the conflicting
part, so that I'm not accused of having scuttled Wesnoth...
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/widgets/menu.hpp.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
Patches:
Index: wesnoth/src/widgets/menu.hpp
diff -u wesnoth/src/widgets/menu.hpp:1.28 wesnoth/src/widgets/menu.hpp:1.29
--- wesnoth/src/widgets/menu.hpp:1.28 Thu Dec 2 21:57:28 2004
+++ wesnoth/src/widgets/menu.hpp Thu Dec 2 22:02:51 2004
@@ -12,7 +12,7 @@
#include "SDL.h"
-char const HELP_STRING_SEPARATOR = '|', DEFAULT_ITEM = '*', COLUMN_SEPARATOR =
'\t', IMAGE_PREFIX = '&';
+char const HELP_STRING_SEPARATOR = '|', DEFAULT_ITEM = '*', COLUMN_SEPARATOR =
',', IMAGE_PREFIX = '&';
namespace gui {
- [Wesnoth-cvs-commits] wesnoth/src/widgets menu.hpp,
Guillaume Melquiond <=