diff options
-rw-r--r-- | cpp/include/IceUtil/ResourceConfig.h | 2 | ||||
-rw-r--r-- | cpp/src/IceGrid/Parser.cpp | 2 | ||||
-rw-r--r-- | cpp/src/IceStorm/Parser.cpp | 2 | ||||
-rw-r--r-- | cpp/src/Slice/JavaUtil.cpp | 2 | ||||
-rw-r--r-- | cpp/src/slice2php/Main.cpp | 2 | ||||
-rw-r--r-- | cpp/test/ios/bundles/BundleInfo.plist | 2 | ||||
-rw-r--r-- | cpp/test/ios/controller/Bundle/Info.plist | 2 | ||||
-rw-r--r-- | cpp/test/ios/controller/Classes/main.m | 9 | ||||
-rw-r--r-- | csharp/src/Glacier2/AssemblyInfo.cs | 2 | ||||
-rw-r--r-- | csharp/src/Ice/AssemblyInfo.cs | 2 | ||||
-rw-r--r-- | csharp/src/IceBox/AssemblyInfo.cs | 2 | ||||
-rw-r--r-- | csharp/src/IceBox/AssemblyInfoExe.cs | 2 | ||||
-rw-r--r-- | csharp/src/IceDiscovery/AssemblyInfo.cs | 2 | ||||
-rw-r--r-- | csharp/src/IceGrid/AssemblyInfo.cs | 2 | ||||
-rw-r--r-- | csharp/src/IceLocatorDiscovery/AssemblyInfo.cs | 2 | ||||
-rw-r--r-- | csharp/src/IcePatch2/AssemblyInfo.cs | 2 | ||||
-rw-r--r-- | csharp/src/IceSSL/AssemblyInfo.cs | 2 | ||||
-rw-r--r-- | csharp/src/IceStorm/AssemblyInfo.cs | 2 | ||||
-rw-r--r-- | csharp/test/TestCommon/Properties/AssemblyInfo.cs | 2 | ||||
-rw-r--r-- | objective-c/test/ios/controller/Classes/main.m | 9 |
20 files changed, 28 insertions, 26 deletions
diff --git a/cpp/include/IceUtil/ResourceConfig.h b/cpp/include/IceUtil/ResourceConfig.h index 988fccbc60b..6333b2ef824 100644 --- a/cpp/include/IceUtil/ResourceConfig.h +++ b/cpp/include/IceUtil/ResourceConfig.h @@ -16,7 +16,7 @@ #define ICE_STRING_VERSION "3.7.0\0" #define ICE_SO_VERSION "37\0" #define ICE_COMPANY_NAME "ZeroC, Inc.\0" -#define ICE_COPYRIGHT "\251 2003-2016 ZeroC, Inc.\0" +#define ICE_COPYRIGHT "\251 2003-2017 ZeroC, Inc.\0" #define ICE_PRODUCT_NAME "Ice\0" #ifdef ICE_CPP11_MAPPING diff --git a/cpp/src/IceGrid/Parser.cpp b/cpp/src/IceGrid/Parser.cpp index 685c043d2b3..81ab1d9de49 100644 --- a/cpp/src/IceGrid/Parser.cpp +++ b/cpp/src/IceGrid/Parser.cpp @@ -2526,7 +2526,7 @@ Parser::showLog(const string& id, const string& reader, bool tail, bool follow, void Parser::showBanner() { - consoleOut << "Ice " << ICE_STRING_VERSION << " Copyright (c) 2003-2016 ZeroC, Inc." << endl; + consoleOut << "Ice " << ICE_STRING_VERSION << " Copyright (c) 2003-2017 ZeroC, Inc." << endl; } void diff --git a/cpp/src/IceStorm/Parser.cpp b/cpp/src/IceStorm/Parser.cpp index a30c369c402..32ccd9102d4 100644 --- a/cpp/src/IceStorm/Parser.cpp +++ b/cpp/src/IceStorm/Parser.cpp @@ -410,7 +410,7 @@ Parser::current(const list<string>& args) void Parser::showBanner() { - consoleOut << "Ice " << ICE_STRING_VERSION << " Copyright (c) 2003-2016 ZeroC, Inc." << endl; + consoleOut << "Ice " << ICE_STRING_VERSION << " Copyright (c) 2003-2017 ZeroC, Inc." << endl; } // diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index 9b3b1b81f53..b5c7f669604 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -771,7 +771,7 @@ Slice::JavaOutput::printHeader() static const char* header = "// **********************************************************************\n" "//\n" -"// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.\n" +"// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.\n" "//\n" "// This copy of Ice is licensed to you under the terms described in the\n" "// ICE_LICENSE file included in this distribution.\n" diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp index f3dd46e1df5..e16536d6e0c 100644 --- a/cpp/src/slice2php/Main.cpp +++ b/cpp/src/slice2php/Main.cpp @@ -1549,7 +1549,7 @@ printHeader(IceUtilInternal::Output& out) static const char* header = "// **********************************************************************\n" "//\n" - "// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.\n" + "// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.\n" "//\n" "// This copy of Ice is licensed to you under the terms described in the\n" "// ICE_LICENSE file included in this distribution.\n" diff --git a/cpp/test/ios/bundles/BundleInfo.plist b/cpp/test/ios/bundles/BundleInfo.plist index eefb65fecea..2f21eaf6aea 100644 --- a/cpp/test/ios/bundles/BundleInfo.plist +++ b/cpp/test/ios/bundles/BundleInfo.plist @@ -43,6 +43,6 @@ <key>DTXcodeBuild</key> <string>4H127</string> <key>NSHumanReadableCopyright</key> - <string>Copyright © 2013 ZeroC. All rights reserved.</string> + <string>Copyright © 2013-2017 ZeroC. All rights reserved.</string> </dict> </plist> diff --git a/cpp/test/ios/controller/Bundle/Info.plist b/cpp/test/ios/controller/Bundle/Info.plist index 32e926f85b2..712e25183b3 100644 --- a/cpp/test/ios/controller/Bundle/Info.plist +++ b/cpp/test/ios/controller/Bundle/Info.plist @@ -19,7 +19,7 @@ <key>CFBundleVersion</key> <string>1</string> <key>NSHumanReadableCopyright</key> - <string>Copyright © 2016 ZeroC, Inc. All rights reserved.</string> + <string>Copyright © 2013-2017 ZeroC, Inc. All rights reserved.</string> <key>NSPrincipalClass</key> <string></string> </dict> diff --git a/cpp/test/ios/controller/Classes/main.m b/cpp/test/ios/controller/Classes/main.m index bd3a0a0c555..0b9518dfad4 100644 --- a/cpp/test/ios/controller/Classes/main.m +++ b/cpp/test/ios/controller/Classes/main.m @@ -1,10 +1,11 @@ +// ********************************************************************** // -// main.m -// C++ Test Controller +// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. // -// Created by Benoit Foucher on 08/12/2016. -// Copyright © 2016 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. // +// ********************************************************************** #import <UIKit/UIKit.h> #import "AppDelegate.h" diff --git a/csharp/src/Glacier2/AssemblyInfo.cs b/csharp/src/Glacier2/AssemblyInfo.cs index 1e75930ea25..375c0de2130 100644 --- a/csharp/src/Glacier2/AssemblyInfo.cs +++ b/csharp/src/Glacier2/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("ZeroC, Inc.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Ice")] -[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] +[assembly: AssemblyCopyright("© 2003-2017 ZeroC, Inc.")] [assembly: AssemblyCulture("")] [assembly: AssemblyVersion("3.7.0")] diff --git a/csharp/src/Ice/AssemblyInfo.cs b/csharp/src/Ice/AssemblyInfo.cs index fe7d81466c7..8e455661783 100644 --- a/csharp/src/Ice/AssemblyInfo.cs +++ b/csharp/src/Ice/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("ZeroC, Inc.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Ice")] -[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] +[assembly: AssemblyCopyright("© 2003-2017 ZeroC, Inc.")] [assembly: AssemblyCulture("")] [assembly: AssemblyVersion("3.7.0")] diff --git a/csharp/src/IceBox/AssemblyInfo.cs b/csharp/src/IceBox/AssemblyInfo.cs index 4bf1eaa37e3..8a60a0c4a0d 100644 --- a/csharp/src/IceBox/AssemblyInfo.cs +++ b/csharp/src/IceBox/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("ZeroC, Inc.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Ice")] -[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] +[assembly: AssemblyCopyright("© 2003-2017 ZeroC, Inc.")] [assembly: AssemblyCulture("")] [assembly: AssemblyVersion("3.7.0")] diff --git a/csharp/src/IceBox/AssemblyInfoExe.cs b/csharp/src/IceBox/AssemblyInfoExe.cs index 6db8edfdb94..c814341bd3a 100644 --- a/csharp/src/IceBox/AssemblyInfoExe.cs +++ b/csharp/src/IceBox/AssemblyInfoExe.cs @@ -19,7 +19,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("ZeroC, Inc.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Ice")] -[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] +[assembly: AssemblyCopyright("© 2003-2017 ZeroC, Inc.")] [assembly: AssemblyCulture("")] [assembly: AssemblyVersion("3.7.0")] diff --git a/csharp/src/IceDiscovery/AssemblyInfo.cs b/csharp/src/IceDiscovery/AssemblyInfo.cs index ede54f24764..5c28a6a4b47 100644 --- a/csharp/src/IceDiscovery/AssemblyInfo.cs +++ b/csharp/src/IceDiscovery/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("ZeroC, Inc.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Ice")] -[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] +[assembly: AssemblyCopyright("© 2003-2017 ZeroC, Inc.")] [assembly: AssemblyCulture("")] [assembly: AssemblyVersion("3.7.0")] diff --git a/csharp/src/IceGrid/AssemblyInfo.cs b/csharp/src/IceGrid/AssemblyInfo.cs index 05acfeac8e0..8b194409b0f 100644 --- a/csharp/src/IceGrid/AssemblyInfo.cs +++ b/csharp/src/IceGrid/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("ZeroC, Inc.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Ice")] -[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] +[assembly: AssemblyCopyright("© 2003-2017 ZeroC, Inc.")] [assembly: AssemblyCulture("")] [assembly: AssemblyVersion("3.7.0")] diff --git a/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs b/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs index 54c0943c032..df19a3697a3 100644 --- a/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs +++ b/csharp/src/IceLocatorDiscovery/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("ZeroC, Inc.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Ice")] -[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] +[assembly: AssemblyCopyright("© 2003-2017 ZeroC, Inc.")] [assembly: AssemblyCulture("")] [assembly: AssemblyVersion("3.7.0")] diff --git a/csharp/src/IcePatch2/AssemblyInfo.cs b/csharp/src/IcePatch2/AssemblyInfo.cs index e944322499a..fa47c2a4f84 100644 --- a/csharp/src/IcePatch2/AssemblyInfo.cs +++ b/csharp/src/IcePatch2/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("ZeroC, Inc.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Ice")] -[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] +[assembly: AssemblyCopyright("© 2003-2017 ZeroC, Inc.")] [assembly: AssemblyCulture("")] [assembly: AssemblyVersion("3.7.0")] diff --git a/csharp/src/IceSSL/AssemblyInfo.cs b/csharp/src/IceSSL/AssemblyInfo.cs index f654b5201c4..cdcd4dd1c1b 100644 --- a/csharp/src/IceSSL/AssemblyInfo.cs +++ b/csharp/src/IceSSL/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("ZeroC, Inc.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Ice")] -[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] +[assembly: AssemblyCopyright("© 2003-2017 ZeroC, Inc.")] [assembly: AssemblyCulture("")] [assembly: AssemblyVersion("3.7.0")] diff --git a/csharp/src/IceStorm/AssemblyInfo.cs b/csharp/src/IceStorm/AssemblyInfo.cs index 47196497b3f..4f926c7a328 100644 --- a/csharp/src/IceStorm/AssemblyInfo.cs +++ b/csharp/src/IceStorm/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("ZeroC, Inc.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Ice")] -[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] +[assembly: AssemblyCopyright("© 2003-2017 ZeroC, Inc.")] [assembly: AssemblyCulture("")] [assembly: AssemblyVersion("3.7.0")] diff --git a/csharp/test/TestCommon/Properties/AssemblyInfo.cs b/csharp/test/TestCommon/Properties/AssemblyInfo.cs index c7a7373f856..aaa8e623b89 100644 --- a/csharp/test/TestCommon/Properties/AssemblyInfo.cs +++ b/csharp/test/TestCommon/Properties/AssemblyInfo.cs @@ -19,7 +19,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("ZeroC, Inc.")] [assembly: AssemblyProduct("Ice")] -[assembly: AssemblyCopyright("© 2003-2016 ZeroC, Inc.")] +[assembly: AssemblyCopyright("© 2003-2017 ZeroC, Inc.")] [assembly: AssemblyCulture("")] // Setting ComVisible to false makes the types in this assembly not visible diff --git a/objective-c/test/ios/controller/Classes/main.m b/objective-c/test/ios/controller/Classes/main.m index bd3a0a0c555..0b9518dfad4 100644 --- a/objective-c/test/ios/controller/Classes/main.m +++ b/objective-c/test/ios/controller/Classes/main.m @@ -1,10 +1,11 @@ +// ********************************************************************** // -// main.m -// C++ Test Controller +// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved. // -// Created by Benoit Foucher on 08/12/2016. -// Copyright © 2016 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. // +// ********************************************************************** #import <UIKit/UIKit.h> #import "AppDelegate.h" |