diff options
| author | Sebastian Valle <s.v.h21@hotmail.com> | 2013-10-29 13:13:37 -0500 |
|---|---|---|
| committer | Sebastian Valle <s.v.h21@hotmail.com> | 2013-10-29 13:13:37 -0500 |
| commit | bb057ae40be2733f3f582a93e585b8bb67cf1520 (patch) | |
| tree | 76a7f9727dc33d068b3c2433189bee42a7edcde1 /cmake | |
| parent | 4ce12dc481323c11b4830d06f8080412d855cc64 (diff) | |
| parent | 3d5a317b755f4b6eb2d9a29fd7d9291415dfa6eb (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw
Conflicts:
src/server/collision/Management/MMapManager.h
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/genrev.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/genrev.cmake b/cmake/genrev.cmake index b39a0780b1c..ceeed7bfac7 100644 --- a/cmake/genrev.cmake +++ b/cmake/genrev.cmake @@ -58,7 +58,7 @@ else() # No valid ways available to find/set the revision/hash, so let's force some defaults message(STATUS " Could not find a proper repository signature (hash) - you may need to pull tags with git fetch -t - Continuing anyway - note that the versionstring will be set to \"unknown 1970-01-01 00:00:00 (Archived)"\") + Continuing anyway - note that the versionstring will be set to \"unknown 1970-01-01 00:00:00 (Archived)\"") set(rev_date "1970-01-01 00:00:00 +0000") set(rev_hash "unknown") set(rev_branch "Archived") |