Merge remote-tracking branch 'upstream/master' into osx

35 files changed, 35 insertions, 35 deletions

diff --git a/src/utils/checkutils.cpp b/src/utils/checkutils.cpp
index c943d8f36..df95f56da 100644
--- a/src/utils/checkutils.cpp
+++ b/src/utils/checkutils.cpp
@@ -1,6 +1,6 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2012  The ManaPlus Developers
+ *  Copyright (C) 2012-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/checkutils.h b/src/utils/checkutils.h
index de5dd8fe2..9dad2a669 100644
--- a/src/utils/checkutils.h
+++ b/src/utils/checkutils.h
@@ -1,6 +1,6 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2012  The ManaPlus Developers
+ *  Copyright (C) 2012-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp
index 82a58f113..da3d40afb 100644
--- a/src/utils/copynpaste.cpp
+++ b/src/utils/copynpaste.cpp
@@ -1,7 +1,7 @@
 /*
  *  Retrieve string pasted depending on OS mechanisms.
  *  Copyright (C) 2001-2010  Wormux Team
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/copynpaste.h b/src/utils/copynpaste.h
index 7bc2536c5..ea827158d 100644
--- a/src/utils/copynpaste.h
+++ b/src/utils/copynpaste.h
@@ -1,7 +1,7 @@
 /*
  *  Retrieve string pasted depending on OS mechanisms.
  *  Copyright (C) 2001-2010  Wormux Team
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/dtor.h b/src/utils/dtor.h
index 54fa11549..17eee70ce 100644
--- a/src/utils/dtor.h
+++ b/src/utils/dtor.h
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2004-2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/gettext.h b/src/utils/gettext.h
index f9aae5a71..c9ffd6c27 100644
--- a/src/utils/gettext.h
+++ b/src/utils/gettext.h
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2007-2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/langs.cpp b/src/utils/langs.cpp
index 0b97921fa..538865b61 100644
--- a/src/utils/langs.cpp
+++ b/src/utils/langs.cpp
@@ -1,6 +1,6 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/langs.h b/src/utils/langs.h
index 38fa2c8e1..a10fd72d7 100644
--- a/src/utils/langs.h
+++ b/src/utils/langs.h
@@ -1,6 +1,6 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/mathutils.h b/src/utils/mathutils.h
index 0472750d3..c58777d06 100644
--- a/src/utils/mathutils.h
+++ b/src/utils/mathutils.h
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/mkdir.cpp b/src/utils/mkdir.cpp
index c7cacf0cb..bc089d3d8 100644
--- a/src/utils/mkdir.cpp
+++ b/src/utils/mkdir.cpp
@@ -1,7 +1,7 @@
 /*
  *  The ManaPlus Client
  *  Copyright (C) 2010  The Mana Developers
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/mkdir.h b/src/utils/mkdir.h
index f72548c92..1eb5e1c82 100644
--- a/src/utils/mkdir.h
+++ b/src/utils/mkdir.h
@@ -1,7 +1,7 @@
 /*
  *  The ManaPlus Client
  *  Copyright (C) 2010  The Mana Developers
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/mutex.h b/src/utils/mutex.h
index 21e1ff9c9..5eee6761c 100644
--- a/src/utils/mutex.h
+++ b/src/utils/mutex.h
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2008-2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp
index f67a6c473..bf4cd5e48 100644
--- a/src/utils/paths.cpp
+++ b/src/utils/paths.cpp
@@ -1,6 +1,6 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/paths.h b/src/utils/paths.h
index 82e7c6a17..26a9dea27 100644
--- a/src/utils/paths.h
+++ b/src/utils/paths.h
@@ -1,6 +1,6 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/perfomance.cpp b/src/utils/perfomance.cpp
index db25b4fe7..5114906d5 100644
--- a/src/utils/perfomance.cpp
+++ b/src/utils/perfomance.cpp
@@ -1,6 +1,6 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2012  The ManaPlus Developers
+ *  Copyright (C) 2012-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/perfomance.h b/src/utils/perfomance.h
index ddca355c1..bd441e06b 100644
--- a/src/utils/perfomance.h
+++ b/src/utils/perfomance.h
@@ -1,6 +1,6 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2012  The ManaPlus Developers
+ *  Copyright (C) 2012-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/physfsrwops.cpp b/src/utils/physfsrwops.cpp
index a52b072e3..ba3dc45e7 100644
--- a/src/utils/physfsrwops.cpp
+++ b/src/utils/physfsrwops.cpp
@@ -19,7 +19,7 @@
  *
  *  This file was written by Ryan C. Gordon. (icculus@icculus.org).
  *
- *  Copyright (C) 2012  The ManaPlus Developers
+ *  Copyright (C) 2012-2013  The ManaPlus Developers
  */
 
 #include "utils/physfsrwops.h"
diff --git a/src/utils/physfsrwops.h b/src/utils/physfsrwops.h
index f6d335390..fbd1020dd 100644
--- a/src/utils/physfsrwops.h
+++ b/src/utils/physfsrwops.h
@@ -19,7 +19,7 @@
  *
  *  This file was written by Ryan C. Gordon. (icculus@icculus.org).
  *
- *  Copyright (C) 2012  The ManaPlus Developers
+ *  Copyright (C) 2012-2013  The ManaPlus Developers
  */
 
 #ifndef UTILS_PHYSFSRWOPS_H
diff --git a/src/utils/process.cpp b/src/utils/process.cpp
index a4c4d3143..822121e9b 100644
--- a/src/utils/process.cpp
+++ b/src/utils/process.cpp
@@ -1,6 +1,6 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/process.h b/src/utils/process.h
index 1895ed880..6b34fd22d 100644
--- a/src/utils/process.h
+++ b/src/utils/process.h
@@ -1,6 +1,6 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/sha256.cpp b/src/utils/sha256.cpp
index d0c4978ff..79ec25154 100644
--- a/src/utils/sha256.cpp
+++ b/src/utils/sha256.cpp
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2008-2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file has been slighly modified as part of The ManaPlus Client.
  *
diff --git a/src/utils/sha256.h b/src/utils/sha256.h
index a2a852614..7a46e5f86 100644
--- a/src/utils/sha256.h
+++ b/src/utils/sha256.h
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2007-2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/specialfolder.cpp b/src/utils/specialfolder.cpp
index 9690a9fb7..536b4158f 100644
--- a/src/utils/specialfolder.cpp
+++ b/src/utils/specialfolder.cpp
@@ -1,7 +1,7 @@
 /*
  *  The ManaPlus Client
  *  Copyright (C) 2010  The Mana Developers
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/specialfolder.h b/src/utils/specialfolder.h
index f8de79ebe..31ec95ef7 100644
--- a/src/utils/specialfolder.h
+++ b/src/utils/specialfolder.h
@@ -1,7 +1,7 @@
 /*
  *  The ManaPlus Client
  *  Copyright (C) 2010  The Mana Developers
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index 7c7b76ea6..14e30b659 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2007-2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h
index 819b1a7c6..45c1f4b0a 100644
--- a/src/utils/stringutils.h
+++ b/src/utils/stringutils.h
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2007-2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/stringvector.h b/src/utils/stringvector.h
index c254bd5de..ab8f77c51 100644
--- a/src/utils/stringvector.h
+++ b/src/utils/stringvector.h
@@ -1,6 +1,6 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2012  The ManaPlus Developers
+ *  Copyright (C) 2012-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/translation/podict.cpp b/src/utils/translation/podict.cpp
index ebd0682ed..9161d3582 100644
--- a/src/utils/translation/podict.cpp
+++ b/src/utils/translation/podict.cpp
@@ -1,6 +1,6 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2012  The ManaPlus Developers
+ *  Copyright (C) 2012-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/translation/podict.h b/src/utils/translation/podict.h
index bfedc2578..ba7b250d3 100644
--- a/src/utils/translation/podict.h
+++ b/src/utils/translation/podict.h
@@ -1,6 +1,6 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2012  The ManaPlus Developers
+ *  Copyright (C) 2012-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/translation/poparser.cpp b/src/utils/translation/poparser.cpp
index 3a415b27b..c0f518b52 100644
--- a/src/utils/translation/poparser.cpp
+++ b/src/utils/translation/poparser.cpp
@@ -1,6 +1,6 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2012  The ManaPlus Developers
+ *  Copyright (C) 2012-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/translation/poparser.h b/src/utils/translation/poparser.h
index 1fc44adb0..b5bbd03c5 100644
--- a/src/utils/translation/poparser.h
+++ b/src/utils/translation/poparser.h
@@ -1,6 +1,6 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2012  The ManaPlus Developers
+ *  Copyright (C) 2012-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp
index 4d5767c8a..6378b0290 100644
--- a/src/utils/translation/translationmanager.cpp
+++ b/src/utils/translation/translationmanager.cpp
@@ -1,6 +1,6 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2012  The ManaPlus Developers
+ *  Copyright (C) 2012-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/translation/translationmanager.h b/src/utils/translation/translationmanager.h
index 55d8a44e4..cc9c8b6a5 100644
--- a/src/utils/translation/translationmanager.h
+++ b/src/utils/translation/translationmanager.h
@@ -1,6 +1,6 @@
 /*
  *  The ManaPlus Client
- *  Copyright (C) 2012  The ManaPlus Developers
+ *  Copyright (C) 2012-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 73418cc60..1d26f0388 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2004-2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
diff --git a/src/utils/xml.h b/src/utils/xml.h
index ee010dde0..a0ce23d07 100644
--- a/src/utils/xml.h
+++ b/src/utils/xml.h
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2004-2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2012  The ManaPlus Developers
+ *  Copyright (C) 2011-2013  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *