summaryrefslogtreecommitdiff
path: root/src/gui/palette.cpp
diff options
context:
space:
mode:
authorDavid Athay <ko2fan@gmail.com>2009-04-06 15:12:19 +0100
committerDavid Athay <ko2fan@gmail.com>2009-04-06 15:12:19 +0100
commit004b2853d37a18a67c348c29e4500f3ef68337b5 (patch)
tree12254803a546f6082c3d3ff16ad2fa7fbaf177b1 /src/gui/palette.cpp
parent4c6c35c638a340fb8dc5f6bad051e5024dfc1d42 (diff)
parentfa5f2c6d2adc4710cf97dfe1316791cf65d551ef (diff)
downloadmana-client-004b2853d37a18a67c348c29e4500f3ef68337b5.tar.gz
mana-client-004b2853d37a18a67c348c29e4500f3ef68337b5.tar.bz2
mana-client-004b2853d37a18a67c348c29e4500f3ef68337b5.tar.xz
mana-client-004b2853d37a18a67c348c29e4500f3ef68337b5.zip
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/gui/palette.cpp')
-rw-r--r--src/gui/palette.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp
index 5526e802..329a4a29 100644
--- a/src/gui/palette.cpp
+++ b/src/gui/palette.cpp
@@ -90,7 +90,7 @@ Palette::Palette() :
addColor(HIGHLIGHT, 0xebc873, STATIC, _("Highlight"), 'H');
addColor(TAB_HIGHLIGHT, 0xff0000, PULSE, indent + _("Tab Highlight"));
addColor(SHOP_WARNING, 0x910000, STATIC, indent + _("Item too expensive"));
- addColor(ITEM_EQUIPED, 0x000091, STATIC, indent + _("Item is equiped"));
+ addColor(ITEM_EQUIPPED, 0x000091, STATIC, indent + _("Item is equipped"));
addColor(CHAT, 0x000000, STATIC, _("Chat"), 'C');
addColor(GM, 0xff0000, STATIC, indent + _("GM"), 'G');