diff options
| author | Bernard Normier <bernard@zeroc.com> | 2006-10-16 14:56:26 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2006-10-16 14:56:26 +0000 |
| commit | 89521cdc3bb3744a1ca3051003e28449ac344c16 (patch) | |
| tree | 270f0375c41fc6205371a25376da6895b57a82fa /java/src | |
| parent | Added install targets for BCC "pdb" files (diff) | |
| download | ice-89521cdc3bb3744a1ca3051003e28449ac344c16.tar.bz2 ice-89521cdc3bb3744a1ca3051003e28449ac344c16.tar.xz ice-89521cdc3bb3744a1ca3051003e28449ac344c16.zip | |
Merged R3_1_branch after 3.1.1 release
Diffstat (limited to 'java/src')
| -rwxr-xr-x | java/src/IceGridGUI/SessionKeeper.java | 2 | ||||
| -rw-r--r-- | java/src/IceUtil/Version.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/java/src/IceGridGUI/SessionKeeper.java b/java/src/IceGridGUI/SessionKeeper.java index 62df5463fd1..fd52576c038 100755 --- a/java/src/IceGridGUI/SessionKeeper.java +++ b/java/src/IceGridGUI/SessionKeeper.java @@ -847,7 +847,7 @@ class SessionKeeper _registryInstanceName.setText(_loginInfo.registryInstanceName); _registryEndpoints.setText(_loginInfo.registryEndpoints); - _registrySSLEnabled.setSelected(_loginInfo.routerSSLEnabled); + _registrySSLEnabled.setSelected(_loginInfo.registrySSLEnabled); _routerUsername.setText(_loginInfo.routerUsername); selectRouterUseSSL(_loginInfo.routerUseSSL); diff --git a/java/src/IceUtil/Version.java b/java/src/IceUtil/Version.java index d6275967f72..58dd4469d10 100644 --- a/java/src/IceUtil/Version.java +++ b/java/src/IceUtil/Version.java @@ -14,6 +14,6 @@ public final class Version // // The Ice version. // - public final static String ICE_STRING_VERSION = "3.1.0"; // "A.B.C", with A=major, B=minor, C=patch - public final static int ICE_INT_VERSION = 30100; // AABBCC, with AA=major, BB=minor, CC=patch + public final static String ICE_STRING_VERSION = "3.2.0"; // "A.B.C", with A=major, B=minor, C=patch + public final static int ICE_INT_VERSION = 30200; // AABBCC, with AA=major, BB=minor, CC=patch } |