diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-01 23:12:21 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-01 23:12:21 +0100 |
| commit | 62adbdab992ec177f60dec76447508741de4e7db (patch) | |
| tree | f71d5970526fe06b04f6ba7953bec70f665aaf5e /cmake | |
| parent | 234f0971200a0d75db61b163afc433270bce632b (diff) | |
| parent | 01b705c84422902201a9ae51b1fb457f9f53d601 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/genrev.cmake | 2 | ||||
| -rw-r--r-- | cmake/macros/CheckBuildDir.cmake | 2 | ||||
| -rw-r--r-- | cmake/options.cmake | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmake/genrev.cmake b/cmake/genrev.cmake index b1112d13c12..c7a188d1993 100644 --- a/cmake/genrev.cmake +++ b/cmake/genrev.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2008-2012 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2013 Trinity <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/cmake/macros/CheckBuildDir.cmake b/cmake/macros/CheckBuildDir.cmake index d67f930df99..3cc56dae47b 100644 --- a/cmake/macros/CheckBuildDir.cmake +++ b/cmake/macros/CheckBuildDir.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2008-2012 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2013 Trinity <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without diff --git a/cmake/options.cmake b/cmake/options.cmake index 5802ab86f43..f58c88ba1d5 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2008-2012 Trinity <http://www.trinitycore.org/> +# Copyright (C) 2008-2013 Trinity <http://www.trinitycore.org/> # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without |