diff options
| author | Bernard Normier <bernard@zeroc.com> | 2009-01-23 17:07:21 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2009-01-23 17:07:21 -0500 |
| commit | 2380e089401d048490da23bc6d71e5687bafbe47 (patch) | |
| tree | 6d97052d1f93bc2bafcd7fd1a9ebe103544b6cad /cpp/include/IceUtil/Config.h | |
| parent | Fixed permissions (diff) | |
| parent | 3.3.1 third-party updates (diff) | |
| download | ice-2380e089401d048490da23bc6d71e5687bafbe47.tar.bz2 ice-2380e089401d048490da23bc6d71e5687bafbe47.tar.xz ice-2380e089401d048490da23bc6d71e5687bafbe47.zip | |
Merge branch 'R3_3_branch' of cvs:/home/git/ice into R3_3_branch
Conflicts:
java/resources/IceGridAdmin/icegridadmin_content_dyn.html
java/resources/IceGridAdmin/icegridadmin_content_static.html
Diffstat (limited to 'cpp/include/IceUtil/Config.h')
| -rw-r--r-- | cpp/include/IceUtil/Config.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index 41bbcd39a57..28bd4f27e90 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -214,7 +214,7 @@ typedef long long Int64; // // The Ice version. // -#define ICE_STRING_VERSION "3.3.0" // "A.B.C", with A=major, B=minor, C=patch -#define ICE_INT_VERSION 30300 // AABBCC, with AA=major, BB=minor, CC=patch +#define ICE_STRING_VERSION "3.3.1" // "A.B.C", with A=major, B=minor, C=patch +#define ICE_INT_VERSION 30301 // AABBCC, with AA=major, BB=minor, CC=patch #endif |