From 489a429bea6739dfa25503b9329bd9e33bffb856 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 25 Sep 2008 00:15:44 +0000
Subject: Merged the Tametomo branch into trunk.

---
 src/keyboardconfig.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/keyboardconfig.h')

diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index b98fcb7a..b57136dc 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id: keyboardconfig.h 4255 2008-05-21 21:44:27Z crush_tmw $
+ *  $Id$
  */
 
 #ifndef _TMW_KEYBOARDCONFIG_H
@@ -151,6 +151,7 @@ class KeyboardConfig
             KEY_MOVE_LEFT,
             KEY_MOVE_RIGHT,
             KEY_ATTACK,
+            KEY_SMILIE,
             KEY_TARGET,
             KEY_TARGET_CLOSEST,
             KEY_TARGET_PLAYER,
-- 
cgit v1.2.3-70-g09d2