summaryrefslogtreecommitdiff
path: root/CIAO
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2012-10-12 09:21:55 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2012-10-12 09:21:55 +0000
commit1b27ac90f086593d69e9d4d55666c98f67534a71 (patch)
tree9e876eacbfab62c786970f0627c174a89aa29547 /CIAO
parent74565991feb58c6da1743c5dad200718d5b5acc5 (diff)
downloadATCD-1b27ac90f086593d69e9d4d55666c98f67534a71.tar.gz
ChangeLogTag:Fri Oct 12 11:20:25 CEST 2012 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'CIAO')
-rw-r--r--CIAO/ChangeLog4
-rw-r--r--CIAO/PROBLEM-REPORT-FORM6
-rw-r--r--CIAO/VERSION2
-rw-r--r--CIAO/ciao/Version.h4
4 files changed, 10 insertions, 6 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index e48977c0412..3e5d33a8b9e 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,7 @@
+Fri Oct 12 11:20:25 CEST 2012 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * CIAO version 1.1.5 released.
+
Mon Oct 8 08:02:52 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* ciao/Deployment/Handlers/Component_Handler.cpp:
diff --git a/CIAO/PROBLEM-REPORT-FORM b/CIAO/PROBLEM-REPORT-FORM
index afa8c22ea5d..0a58bb8f1d3 100644
--- a/CIAO/PROBLEM-REPORT-FORM
+++ b/CIAO/PROBLEM-REPORT-FORM
@@ -41,9 +41,9 @@
To: ciao-users@list.isis.vanderbilt.edu
Subject: [area]: [synopsis]
- CIAO VERSION: 1.1.4
- TAO VERSION : 2.1.4
- ACE VERSION : 6.1.4
+ CIAO VERSION: 1.1.5
+ TAO VERSION : 2.1.5
+ ACE VERSION : 6.1.5
HOST MACHINE and OPERATING SYSTEM:
If on Windows based OS's, which version of WINSOCK do you
diff --git a/CIAO/VERSION b/CIAO/VERSION
index a3ef6c0e8a3..20d70c25736 100644
--- a/CIAO/VERSION
+++ b/CIAO/VERSION
@@ -1,4 +1,4 @@
-This is CIAO version 1.1.4, released Wed Aug 29 08:16:04 CEST 2012
+This is CIAO version 1.1.5, released Fri Oct 12 11:20:25 CEST 2012
If you have any problems with or questions about CIAO, please send
e-mail to the CIAO mailing list (ciao-users@list.isis.vanderbilt.edu),
diff --git a/CIAO/ciao/Version.h b/CIAO/ciao/Version.h
index adf4ee98e05..52b64a0a6b0 100644
--- a/CIAO/ciao/Version.h
+++ b/CIAO/ciao/Version.h
@@ -5,5 +5,5 @@
#define CIAO_MAJOR_VERSION 1
#define CIAO_MINOR_VERSION 1
-#define CIAO_BETA_VERSION 4
-#define CIAO_VERSION "1.1.4"
+#define CIAO_BETA_VERSION 5
+#define CIAO_VERSION "1.1.5"