diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:49:13 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:49:13 +0100 |
| commit | 6568b0624dcd03243c70f9aa905b88422cb1e4c2 (patch) | |
| tree | 48ec6babfbfb2f9d255df568b659db9541d11054 /dep/acelite/ace/Version.h | |
| parent | e3add09fb7f8f3c425f6cb0e7611e4e2381bf88d (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Updates/UpdateFields.h
src/server/game/Entities/Unit/Unit.cpp
src/server/scripts/Spells/spell_druid.cpp
Diffstat (limited to 'dep/acelite/ace/Version.h')
| -rw-r--r-- | dep/acelite/ace/Version.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dep/acelite/ace/Version.h b/dep/acelite/ace/Version.h index 835fc849fd1..33a98834bad 100644 --- a/dep/acelite/ace/Version.h +++ b/dep/acelite/ace/Version.h @@ -1,9 +1,9 @@ // -*- C++ -*- -// $Id: Version.h 92364 2010-10-27 10:02:39Z johnnyw $ +// $Id: Version.h 96107 2012-08-29 06:17:32Z johnnyw $ // This is file was automatically generated by \$ACE_ROOT/bin/make_release.py -#define ACE_MAJOR_VERSION 5 -#define ACE_MINOR_VERSION 8 -#define ACE_BETA_VERSION 3 -#define ACE_VERSION "5.8.3" +#define ACE_MAJOR_VERSION 6 +#define ACE_MINOR_VERSION 1 +#define ACE_BETA_VERSION 4 +#define ACE_VERSION "6.1.4" |