aboutsummaryrefslogtreecommitdiff
path: root/src/framework/Makefile.am
diff options
context:
space:
mode:
authorSeline <none@none>2008-10-14 11:57:03 -0500
committerSeline <none@none>2008-10-14 11:57:03 -0500
commit2265aef916e3b2d63d87faa68a2b51e7d747c54c (patch)
treeb05420685b7d202aade6f70a6f511adbfb79e37f /src/framework/Makefile.am
parent222cbfd4644412fb8e5aeed7c37c88797d09964a (diff)
[svn] * Merge Temp dev SVN with Assembla.
* Changes include: - Implementation of w12x's Outdoor PvP and Game Event Systems. - Temporary removal of IRC Chat Bot (until infinite loop when disabled is fixed). - All mangos -> trinity (to convert your mangos_string table, please run mangos_string_to_trinity_string.sql). - Improved Config cleanup. - And many more changes. --HG-- branch : trunk
Diffstat (limited to 'src/framework/Makefile.am')
-rw-r--r--src/framework/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/framework/Makefile.am b/src/framework/Makefile.am
index f09790ab68a..b88de200305 100644
--- a/src/framework/Makefile.am
+++ b/src/framework/Makefile.am
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
+# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -64,3 +64,4 @@ EXTRA_DIST = \
Utilities/LinkedList.h \
Utilities/TypeList.h
+