summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Mesnier <mesnier_p@ociweb.com>2013-04-10 21:37:53 +0000
committerPhil Mesnier <mesnier_p@ociweb.com>2013-04-10 21:37:53 +0000
commit4b117d4a75ca8e7a93a7a64d7040b1ca91d7b454 (patch)
tree269269c85ecf130056cf3661ea9d995d470d1c6f
parentd62c5ec7d94df4ecb26cbb898cdb7e8b40aecf4c (diff)
downloadATCD-4b117d4a75ca8e7a93a7a64d7040b1ca91d7b454.tar.gz
merge from trunk
-rw-r--r--DAnCE/ChangeLog9
-rw-r--r--DAnCE/NEWS5
-rw-r--r--DAnCE/PROBLEM-REPORT-FORM6
-rw-r--r--DAnCE/VERSION2
-rw-r--r--DAnCE/dance/Version.h4
5 files changed, 20 insertions, 6 deletions
diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog
index 58f6350b4d8..cb8660c0335 100644
--- a/DAnCE/ChangeLog
+++ b/DAnCE/ChangeLog
@@ -1,3 +1,12 @@
+Thu Mar 14 08:39:07 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * NEWS:
+ Updated for next release
+
+Thu Mar 14 09:04:46 CET 2013 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * DAnCE version 1.1.8 released.
+
Thu Dec 27 09:19:10 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* NEWS:
diff --git a/DAnCE/NEWS b/DAnCE/NEWS
index 5254afb35df..d05633f69db 100644
--- a/DAnCE/NEWS
+++ b/DAnCE/NEWS
@@ -1,6 +1,11 @@
+USER VISIBLE CHANGES BETWEEN DAnCE-1.1.8 and DAnCE-1.2.0
+=======================================================
+
USER VISIBLE CHANGES BETWEEN DAnCE-1.1.7 and DAnCE-1.1.8
=======================================================
+. None
+
USER VISIBLE CHANGES BETWEEN DAnCE-1.1.6 and DAnCE-1.1.7
=======================================================
diff --git a/DAnCE/PROBLEM-REPORT-FORM b/DAnCE/PROBLEM-REPORT-FORM
index 5810fc908e6..c7a963b0e5c 100644
--- a/DAnCE/PROBLEM-REPORT-FORM
+++ b/DAnCE/PROBLEM-REPORT-FORM
@@ -41,9 +41,9 @@
To: ciao-users@list.isis.vanderbilt.edu
Subject: [area]: [synopsis]
- DAnCE VERSION: 1.1.7
- TAO VERSION : 2.1.7
- ACE VERSION : 6.1.7
+ DAnCE VERSION: 1.1.8
+ TAO VERSION : 2.1.8
+ ACE VERSION : 6.1.8
HOST MACHINE and OPERATING SYSTEM:
If on Windows based OS's, which version of WINSOCK do you
diff --git a/DAnCE/VERSION b/DAnCE/VERSION
index 5bbaa6d38d8..e4edbaaa875 100644
--- a/DAnCE/VERSION
+++ b/DAnCE/VERSION
@@ -1,4 +1,4 @@
-This is DAnCE version 1.1.7, released Thu Dec 27 10:00:49 CET 2012
+This is DAnCE version 1.1.8, released Thu Mar 14 09:04:46 CET 2013
If you have any problems with or questions about DAnCE, please send
e-mail to the CIAO mailing list (ciao-users@list.isis.vanderbilt.edu),
diff --git a/DAnCE/dance/Version.h b/DAnCE/dance/Version.h
index 96905c8a507..7d019eb3c80 100644
--- a/DAnCE/dance/Version.h
+++ b/DAnCE/dance/Version.h
@@ -5,5 +5,5 @@
#define DAnCE_MAJOR_VERSION 1
#define DAnCE_MINOR_VERSION 1
-#define DAnCE_BETA_VERSION 7
-#define DAnCE_VERSION "1.1.7"
+#define DAnCE_BETA_VERSION 8
+#define DAnCE_VERSION "1.1.8"