summaryrefslogtreecommitdiff
path: root/cs
diff options
context:
space:
mode:
Diffstat (limited to 'cs')
-rw-r--r--cs/demo/IceStorm/clock/config.icebox2
-rw-r--r--cs/lib/pkgconfig/Glacier2.pc2
-rw-r--r--cs/lib/pkgconfig/Ice.pc2
-rw-r--r--cs/lib/pkgconfig/IceBox.pc2
-rw-r--r--cs/lib/pkgconfig/IceGrid.pc2
-rw-r--r--cs/lib/pkgconfig/IcePatch2.pc2
-rw-r--r--cs/lib/pkgconfig/IceStorm.pc2
-rw-r--r--cs/src/Glacier2/AssemblyInfo.cs2
-rw-r--r--cs/src/Ice/AssemblyInfo.cs2
-rw-r--r--cs/src/Ice/Util.cs4
-rw-r--r--cs/src/IceBox/AssemblyInfo.cs2
-rw-r--r--cs/src/IceGrid/AssemblyInfo.cs2
-rw-r--r--cs/src/IcePatch2/AssemblyInfo.cs2
-rw-r--r--cs/src/IceSSL/AssemblyInfo.cs2
-rw-r--r--cs/src/IceStorm/AssemblyInfo.cs2
15 files changed, 16 insertions, 16 deletions
diff --git a/cs/demo/IceStorm/clock/config.icebox b/cs/demo/IceStorm/clock/config.icebox
index 455571cacdf..8e4380c1185 100644
--- a/cs/demo/IceStorm/clock/config.icebox
+++ b/cs/demo/IceStorm/clock/config.icebox
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998
#
# The IceStorm service
#
-IceBox.Service.IceStorm=IceStormService,33:createIceStorm --Ice.Config=config.service
+IceBox.Service.IceStorm=IceStormService,34b:createIceStorm --Ice.Config=config.service
#
# Warn about connection exceptions
diff --git a/cs/lib/pkgconfig/Glacier2.pc b/cs/lib/pkgconfig/Glacier2.pc
index f3174ea3bdf..fe6664770d0 100644
--- a/cs/lib/pkgconfig/Glacier2.pc
+++ b/cs/lib/pkgconfig/Glacier2.pc
@@ -1,4 +1,4 @@
-version = 3.3.1
+version = 3.4.51
mono_root = /usr
name = Glacier2
diff --git a/cs/lib/pkgconfig/Ice.pc b/cs/lib/pkgconfig/Ice.pc
index 2883c30b337..085c6e89641 100644
--- a/cs/lib/pkgconfig/Ice.pc
+++ b/cs/lib/pkgconfig/Ice.pc
@@ -1,4 +1,4 @@
-version = 3.3.1
+version = 3.4.51
mono_root = /usr
name = Ice
diff --git a/cs/lib/pkgconfig/IceBox.pc b/cs/lib/pkgconfig/IceBox.pc
index 49ada9ab609..a62209dcc11 100644
--- a/cs/lib/pkgconfig/IceBox.pc
+++ b/cs/lib/pkgconfig/IceBox.pc
@@ -1,4 +1,4 @@
-version = 3.3.1
+version = 3.4.51
mono_root = /usr
name = IceBox
diff --git a/cs/lib/pkgconfig/IceGrid.pc b/cs/lib/pkgconfig/IceGrid.pc
index 7de2b7dee6e..05586a54ff8 100644
--- a/cs/lib/pkgconfig/IceGrid.pc
+++ b/cs/lib/pkgconfig/IceGrid.pc
@@ -1,4 +1,4 @@
-version = 3.3.1
+version = 3.4.51
mono_root = /usr
name = IceGrid
diff --git a/cs/lib/pkgconfig/IcePatch2.pc b/cs/lib/pkgconfig/IcePatch2.pc
index b10238a1d84..310581f3434 100644
--- a/cs/lib/pkgconfig/IcePatch2.pc
+++ b/cs/lib/pkgconfig/IcePatch2.pc
@@ -1,4 +1,4 @@
-version = 3.3.1
+version = 3.4.51
mono_root = /usr
name = IcePatch2
diff --git a/cs/lib/pkgconfig/IceStorm.pc b/cs/lib/pkgconfig/IceStorm.pc
index 6570ab44d3e..a2784c39cc0 100644
--- a/cs/lib/pkgconfig/IceStorm.pc
+++ b/cs/lib/pkgconfig/IceStorm.pc
@@ -1,4 +1,4 @@
-version = 3.3.1
+version = 3.4.51
mono_root = /usr
name = IceStorm
diff --git a/cs/src/Glacier2/AssemblyInfo.cs b/cs/src/Glacier2/AssemblyInfo.cs
index 2394b1ccc26..a5194051f68 100644
--- a/cs/src/Glacier2/AssemblyInfo.cs
+++ b/cs/src/Glacier2/AssemblyInfo.cs
@@ -21,5 +21,5 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCopyright("Copyright (c) 2003-2009 ZeroC, Inc.")]
[assembly: AssemblyTrademark("Ice")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.3.1")]
+[assembly: AssemblyVersion("3.4.51")]
[assembly: AssemblyDelaySign(false)]
diff --git a/cs/src/Ice/AssemblyInfo.cs b/cs/src/Ice/AssemblyInfo.cs
index 9fd787d33a6..3fe6ca28081 100644
--- a/cs/src/Ice/AssemblyInfo.cs
+++ b/cs/src/Ice/AssemblyInfo.cs
@@ -21,5 +21,5 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCopyright("Copyright (c) 2003-2009 ZeroC, Inc.")]
[assembly: AssemblyTrademark("Ice")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.3.1")]
+[assembly: AssemblyVersion("3.4.51")]
[assembly: AssemblyDelaySign(false)]
diff --git a/cs/src/Ice/Util.cs b/cs/src/Ice/Util.cs
index f10aa205afb..97c7b038de7 100644
--- a/cs/src/Ice/Util.cs
+++ b/cs/src/Ice/Util.cs
@@ -438,7 +438,7 @@ namespace Ice
/// <returns>The Ice version.</returns>
public static string stringVersion()
{
- return "3.3.1"; // "A.B.C", with A=major, B=minor, C=patch
+ return "3.4b"; // "A.B.C", with A=major, B=minor, C=patch
}
/// <summary>
@@ -449,7 +449,7 @@ namespace Ice
/// <returns>The Ice version.</returns>
public static int intVersion()
{
- return 30301; // AABBCC, with AA=major, BB=minor, CC=patch
+ return 30451; // AABBCC, with AA=major, BB=minor, CC=patch
}
private static object _processLoggerMutex = new object();
diff --git a/cs/src/IceBox/AssemblyInfo.cs b/cs/src/IceBox/AssemblyInfo.cs
index d3875c5ad3c..6f69f4925c1 100644
--- a/cs/src/IceBox/AssemblyInfo.cs
+++ b/cs/src/IceBox/AssemblyInfo.cs
@@ -21,5 +21,5 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCopyright("Copyright (c) 2003-2009 ZeroC, Inc.")]
[assembly: AssemblyTrademark("Ice")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.3.1")]
+[assembly: AssemblyVersion("3.4.51")]
[assembly: AssemblyDelaySign(false)]
diff --git a/cs/src/IceGrid/AssemblyInfo.cs b/cs/src/IceGrid/AssemblyInfo.cs
index 08576ffe0c1..93f11c331d5 100644
--- a/cs/src/IceGrid/AssemblyInfo.cs
+++ b/cs/src/IceGrid/AssemblyInfo.cs
@@ -21,5 +21,5 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCopyright("Copyright (c) 2003-2009 ZeroC, Inc.")]
[assembly: AssemblyTrademark("Ice")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.3.1")]
+[assembly: AssemblyVersion("3.4.51")]
[assembly: AssemblyDelaySign(false)]
diff --git a/cs/src/IcePatch2/AssemblyInfo.cs b/cs/src/IcePatch2/AssemblyInfo.cs
index abff628fff2..7bdb803f51c 100644
--- a/cs/src/IcePatch2/AssemblyInfo.cs
+++ b/cs/src/IcePatch2/AssemblyInfo.cs
@@ -21,5 +21,5 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCopyright("Copyright (c) 2003-2009 ZeroC, Inc.")]
[assembly: AssemblyTrademark("Ice")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.3.1")]
+[assembly: AssemblyVersion("3.4.51")]
[assembly: AssemblyDelaySign(false)]
diff --git a/cs/src/IceSSL/AssemblyInfo.cs b/cs/src/IceSSL/AssemblyInfo.cs
index 4c02451d399..8ce9f924feb 100644
--- a/cs/src/IceSSL/AssemblyInfo.cs
+++ b/cs/src/IceSSL/AssemblyInfo.cs
@@ -21,5 +21,5 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCopyright("Copyright (c) 2003-2009 ZeroC, Inc.")]
[assembly: AssemblyTrademark("Ice")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.3.1")]
+[assembly: AssemblyVersion("3.4.51")]
[assembly: AssemblyDelaySign(false)]
diff --git a/cs/src/IceStorm/AssemblyInfo.cs b/cs/src/IceStorm/AssemblyInfo.cs
index 21a9430397f..81d2c221bf3 100644
--- a/cs/src/IceStorm/AssemblyInfo.cs
+++ b/cs/src/IceStorm/AssemblyInfo.cs
@@ -21,5 +21,5 @@ using System.Runtime.CompilerServices;
[assembly: AssemblyCopyright("Copyright (c) 2003-2009 ZeroC, Inc.")]
[assembly: AssemblyTrademark("Ice")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("3.3.1")]
+[assembly: AssemblyVersion("3.4.51")]
[assembly: AssemblyDelaySign(false)]