diff options
author | Joe George <joe@zeroc.com> | 2015-09-11 14:30:00 -0400 |
---|---|---|
committer | Joe George <joe@zeroc.com> | 2015-09-11 14:30:00 -0400 |
commit | b9c2a6f6628476f11c78a7de2adc90edca1e209e (patch) | |
tree | df192d87dfbc594a7a2b52a96b5145ad3156d26f /cpp/src/slice2java/Slice2Java.rc | |
parent | ICE-6645 Removed hack to keep binary compatibility in Ice 3.6.1 (diff) | |
parent | Removed ARM configuraton from WinRT testsuite solutions (diff) | |
download | ice-b9c2a6f6628476f11c78a7de2adc90edca1e209e.tar.bz2 ice-b9c2a6f6628476f11c78a7de2adc90edca1e209e.tar.xz ice-b9c2a6f6628476f11c78a7de2adc90edca1e209e.zip |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src/slice2java/Slice2Java.rc')
-rw-r--r-- | cpp/src/slice2java/Slice2Java.rc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/slice2java/Slice2Java.rc b/cpp/src/slice2java/Slice2Java.rc index f5c3b5870bb..a589969595d 100644 --- a/cpp/src/slice2java/Slice2Java.rc +++ b/cpp/src/slice2java/Slice2Java.rc @@ -1,8 +1,8 @@ #include "winver.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,6,0,0 - PRODUCTVERSION 3,6,0,0 + FILEVERSION 3,6,1,0 + PRODUCTVERSION 3,6,1,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -18,13 +18,13 @@ BEGIN BLOCK "040904e4" BEGIN VALUE "CompanyName", "ZeroC, Inc.\0" - VALUE "FileDescription", "Slice To Java Translator\0" - VALUE "FileVersion", "3.6.0\0" + VALUE "FileDescription", "Slice to Java Translator\0" + VALUE "FileVersion", "3.6.1\0" VALUE "InternalName", "slice2java\0" - VALUE "LegalCopyright", "Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.\0" + VALUE "LegalCopyright", "\251 2003-2015 ZeroC, Inc.\0" VALUE "OriginalFilename", "slice2java.exe\0" VALUE "ProductName", "Ice\0" - VALUE "ProductVersion", "3.6.0\0" + VALUE "ProductVersion", "3.6.1\0" END END BLOCK "VarFileInfo" |