summaryrefslogtreecommitdiff
path: root/src/gui/palette.h
diff options
context:
space:
mode:
authorPhilipp Sehmisch <mana@crushnet.org>2010-02-24 19:28:36 +0100
committerPhilipp Sehmisch <mana@crushnet.org>2010-02-24 19:28:36 +0100
commit48131e2ecfa4d52375d890dac80f9ab1ad45ccf0 (patch)
tree0c973f354d827880cdab7a8bab8fa1357e9f97ec /src/gui/palette.h
parenta5e26a9b9a8cab9feeaaa175aa4883913c3ff9d3 (diff)
parentf6d50d0cbe12f8799e6fec844816defc8711df37 (diff)
downloadmana-48131e2ecfa4d52375d890dac80f9ab1ad45ccf0.tar.gz
mana-48131e2ecfa4d52375d890dac80f9ab1ad45ccf0.tar.bz2
mana-48131e2ecfa4d52375d890dac80f9ab1ad45ccf0.tar.xz
mana-48131e2ecfa4d52375d890dac80f9ab1ad45ccf0.zip
Merge branch 'master' of gitorious.org:mana/mana
Diffstat (limited to 'src/gui/palette.h')
-rw-r--r--src/gui/palette.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/palette.h b/src/gui/palette.h
index e353f318..0c1d2df0 100644
--- a/src/gui/palette.h
+++ b/src/gui/palette.h
@@ -71,6 +71,7 @@ class Palette : public gcn::ListModel
ENTRY(WHISPER)\
ENTRY(IS)\
ENTRY(PARTY)\
+ ENTRY(GUILD)\
ENTRY(SERVER)\
ENTRY(LOGGER)\
ENTRY(HYPERLINK)\