diff options
| author | David Athay <ko2fan@gmail.com> | 2009-04-06 15:12:19 +0100 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2009-04-06 15:12:19 +0100 |
| commit | 004b2853d37a18a67c348c29e4500f3ef68337b5 (patch) | |
| tree | 12254803a546f6082c3d3ff16ad2fa7fbaf177b1 /src/gui/palette.h | |
| parent | 4c6c35c638a340fb8dc5f6bad051e5024dfc1d42 (diff) | |
| parent | fa5f2c6d2adc4710cf97dfe1316791cf65d551ef (diff) | |
| download | mana-004b2853d37a18a67c348c29e4500f3ef68337b5.tar.gz mana-004b2853d37a18a67c348c29e4500f3ef68337b5.tar.bz2 mana-004b2853d37a18a67c348c29e4500f3ef68337b5.tar.xz mana-004b2853d37a18a67c348c29e4500f3ef68337b5.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/gui/palette.h')
| -rw-r--r-- | src/gui/palette.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/palette.h b/src/gui/palette.h index 60f4ca8d..222b4256 100644 --- a/src/gui/palette.h +++ b/src/gui/palette.h @@ -58,7 +58,7 @@ class Palette : public gcn::ListModel ENTRY(HIGHLIGHT)\ ENTRY(TAB_HIGHLIGHT)\ ENTRY(SHOP_WARNING)\ - ENTRY(ITEM_EQUIPED)\ + ENTRY(ITEM_EQUIPPED)\ ENTRY(CHAT)\ ENTRY(GM)\ ENTRY(PLAYER)\ |