aboutsummaryrefslogtreecommitdiff
path: root/dep/acelite/ace/Version.h
diff options
context:
space:
mode:
authorNay <dnpd.dd@gmail.com>2012-09-17 23:50:08 +0100
committerNay <dnpd.dd@gmail.com>2012-09-17 23:50:08 +0100
commit23961d0dce22e234e62f116469f04bb62d8986a7 (patch)
treeab271f0a3fffa8f21f9ac7fd669f457beb9eb356 /dep/acelite/ace/Version.h
parent2431895a54b38e4c0e6444c740ff2298e31e26e2 (diff)
parent2e21fa6b925c4572d620248f1b149a5d652836b2 (diff)
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'dep/acelite/ace/Version.h')
-rw-r--r--dep/acelite/ace/Version.h10
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"