Merged new_animation branch until r2415 into trunk.

10 files changed, 14 insertions, 14 deletions

diff --git a/src/gui/chargedialog.h b/src/gui/chargedialog.h
index d1726500..c09c692c 100644
--- a/src/gui/chargedialog.h
+++ b/src/gui/chargedialog.h
@@ -19,7 +19,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
- 
+
 #ifndef _TMW_CHARGE_H
 #define _TMW_CHARGE_H
 
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index f588fa8e..179e5314 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -22,7 +22,7 @@
  */
 
 #ifndef _TMW_INVENTORYWINDOW_H
-#define _TMW_INVENTORYWINDOW_H 
+#define _TMW_INVENTORYWINDOW_H
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/menuwindow.h b/src/gui/menuwindow.h
index 945bca94..f43b9921 100644
--- a/src/gui/menuwindow.h
+++ b/src/gui/menuwindow.h
@@ -48,4 +48,4 @@ class MenuWindow : public Window
 };
 
 #endif
- 
+
diff --git a/src/gui/minimap.h b/src/gui/minimap.h
index 53b18630..5e9458bf 100644
--- a/src/gui/minimap.h
+++ b/src/gui/minimap.h
@@ -22,7 +22,7 @@
  */
 
 #ifndef _TMW_MINIMAP_H
-#define _TMW_MINIMAP_H 
+#define _TMW_MINIMAP_H
 
 #include "window.h"
 
diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h
index b5d149e7..f56f847c 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatus.h
@@ -64,4 +64,4 @@ class MiniStatusWindow : public Window
 };
 
 #endif
- 
+
diff --git a/src/gui/newskill.h b/src/gui/newskill.h
index 96bcf9ad..764019f5 100644
--- a/src/gui/newskill.h
+++ b/src/gui/newskill.h
@@ -20,7 +20,7 @@
  *
  *  $Id$
  */
- 
+
 #ifndef _TMW_NSKILL_H
 #define _TMW_NSKILL_H
 
@@ -35,7 +35,7 @@ class ProgressBar;
 #define N_SKILL 100 // skill count constant
 #define N_SKILL_CAT 9 // skill category count
 #define N_SKILL_CAT_SIZE 10 // skill category maximum size
- 
+
 struct nSkill {
     short level;
     short exp;
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index bde8906b..ec565ac3 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -212,7 +212,7 @@ void SellDialog::action(const std::string& eventId)
     else if (eventId == "sell") {
         // Attempt sell
         assert(mAmountItems > 0 && mAmountItems <= mMaxItems);
-        
+
         MessageOut outMsg(mNetwork);
         outMsg.writeInt16(CMSG_NPC_SELL_REQUEST);
         outMsg.writeInt16(8);
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index d6289bbc..05543092 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -141,7 +141,7 @@ Setup_Video::Setup_Video():
 
     mModeList->setSelected(-1);
     mAlphaSlider->setValue(mOpacity);
-    
+
     mFpsField->setText(toString(mFps));
     mFpsField->setEnabled(mFps > 0);
     mFpsSlider->setValue(mFps);
@@ -213,7 +213,7 @@ void Setup_Video::apply()
         new OkDialog("Changing OpenGL",
                 "Applying change to OpenGL requires restart.");
     }
-    
+
     // FPS change
     config.setValue("fpslimit", mFps);
 
@@ -273,7 +273,7 @@ void Setup_Video::action(const std::string &event)
 void Setup_Video::keyPress(const gcn::Key &key)
 {
     std::stringstream tempFps(mFpsField->getText());
-    
+
     if (tempFps >> mFps)
     {
         if (mFps < 10)
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index d8ee1914..b021ead4 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -42,7 +42,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
         void cancel();
 
         void action(const std::string&);
-        
+
         /** Called when key is pressed */
         void keyPress(const gcn::Key& key);
 
diff --git a/src/gui/status.h b/src/gui/status.h
index 66068a7d..52ece323 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -88,7 +88,7 @@ class StatusWindow : public Window, public gcn::ActionListener {
         gcn::Label *mStatsAccuracyPoints, *mStatsEvadePoints;
         gcn::Label *mStatsReflexPoints;
 
-        /** 
+        /**
          * Stats captions.
          */
         gcn::Label *mStatsLabel[6];
@@ -96,7 +96,7 @@ class StatusWindow : public Window, public gcn::ActionListener {
         gcn::Label *mStatsDisplayLabel[6];
         gcn::Label *mRemainingStatsPointsLabel;
 
-        /** 
+        /**
          * Stats buttons.
          */
         gcn::Button *mStatsButton[6];