diff options
| author | Seline <none@none> | 2008-10-14 11:57:03 -0500 |
|---|---|---|
| committer | Seline <none@none> | 2008-10-14 11:57:03 -0500 |
| commit | 2265aef916e3b2d63d87faa68a2b51e7d747c54c (patch) | |
| tree | b05420685b7d202aade6f70a6f511adbfb79e37f /dep/src | |
| parent | 222cbfd4644412fb8e5aeed7c37c88797d09964a (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 'dep/src')
| -rw-r--r-- | dep/src/Makefile.am | 2 | ||||
| -rw-r--r-- | dep/src/sockets/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dep/src/Makefile.am b/dep/src/Makefile.am index 846703f6a4b..3c5748dda23 100644 --- a/dep/src/Makefile.am +++ b/dep/src/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, diff --git a/dep/src/sockets/Makefile.am b/dep/src/sockets/Makefile.am index be23533e7da..f06453eeba3 100644 --- a/dep/src/sockets/Makefile.am +++ b/dep/src/sockets/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, |