diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-27 21:12:00 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-27 21:12:00 +0100 |
| commit | 9daf06f36a48492e7ff284d0cd6b8182af8b39ce (patch) | |
| tree | 53b1d46bcc050ccfdae60d7ce7148247f9845e78 /revision.h.in.cmake | |
| parent | 052e47780ef9852665287fe76edd51a5911674b0 (diff) | |
| parent | d3ad8a4941124aae2b2ced6cc75c18ec8498664a (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Handlers/SpellHandler.cpp
src/server/game/Spells/Spell.cpp
Diffstat (limited to 'revision.h.in.cmake')
| -rw-r--r-- | revision.h.in.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/revision.h.in.cmake b/revision.h.in.cmake index 12b1603e249..dbd2a8a878c 100644 --- a/revision.h.in.cmake +++ b/revision.h.in.cmake @@ -2,10 +2,11 @@ #define __REVISION_H__ #define _HASH "@rev_hash@" #define _DATE "@rev_date@" + #define _BRANCH "@rev_branch@" #define VER_COMPANYNAME_STR "TrinityCore Developers" #define VER_LEGALCOPYRIGHT_STR "(c)2008-2013 TrinityCore" #define VER_FILEVERSION 0,0,0 - #define VER_FILEVERSION_STR "@rev_date@ (@rev_hash@)" + #define VER_FILEVERSION_STR "@rev_hash@ @rev_date@ (@rev_branch@ branch)" #define VER_PRODUCTVERSION VER_FILEVERSION #define VER_PRODUCTVERSION_STR VER_FILEVERSION_STR #endif // __REVISION_H__ |