summaryrefslogtreecommitdiff
path: root/src/textmanager.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-01-30 01:34:16 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-09 20:00:07 +0100
commit1b1050da1c7b84cc72b7efbb2229294975be9e10 (patch)
tree68d15ccb015d58aeb5797ffd06efca3e55997c24 /src/textmanager.cpp
parent0d4142a891cd228da24ee3aa3bbd7dc622da5b75 (diff)
parent955a7613d1fe116fe5e1da07a222b6849b3c885c (diff)
downloadMana-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.gz
Mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.bz2
Mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.xz
Mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.zip
Merged with Aethyra master as of 2009-01-27
Conflicts: Almost everywhere.
Diffstat (limited to 'src/textmanager.cpp')
-rw-r--r--src/textmanager.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/textmanager.cpp b/src/textmanager.cpp
index bbcc271a..e22f6f4f 100644
--- a/src/textmanager.cpp
+++ b/src/textmanager.cpp
@@ -1,5 +1,6 @@
/*
* The Mana World
+ * Copyright (C) 2008 Douglas Boffey <DougABoffey@netscape.net>
* Copyright (C) 2008 The Mana World Development Team
*
* This file is part of The Mana World.