diff options
| author | Joe George <joe@zeroc.com> | 2017-02-13 18:48:57 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2017-02-13 18:48:57 -0500 |
| commit | dc5678e6988bad79336033518f8f2378f7c34cb2 (patch) | |
| tree | f1b7d00d8bfde31297c4473d62ace3d05031b985 /cpp/src/IceBox | |
| parent | Connection wizard dialog becomes readonly (diff) | |
| parent | ICE-7506 - Update copyright to 2017 (diff) | |
| download | ice-dc5678e6988bad79336033518f8f2378f7c34cb2.tar.bz2 ice-dc5678e6988bad79336033518f8f2378f7c34cb2.tar.xz ice-dc5678e6988bad79336033518f8f2378f7c34cb2.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src/IceBox')
| -rw-r--r-- | cpp/src/IceBox/Admin.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceBox/Exception.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceBox/Service.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceBox/ServiceManagerI.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceBox/ServiceManagerI.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/IceBox/Admin.cpp b/cpp/src/IceBox/Admin.cpp index a7fa43141ce..8767b14d378 100644 --- a/cpp/src/IceBox/Admin.cpp +++ b/cpp/src/IceBox/Admin.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/cpp/src/IceBox/Exception.cpp b/cpp/src/IceBox/Exception.cpp index 757749f36bf..dd75f530200 100644 --- a/cpp/src/IceBox/Exception.cpp +++ b/cpp/src/IceBox/Exception.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/cpp/src/IceBox/Service.cpp b/cpp/src/IceBox/Service.cpp index bbfb78c86c7..f1989701db5 100644 --- a/cpp/src/IceBox/Service.cpp +++ b/cpp/src/IceBox/Service.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index 6226b7c0a4d..77f88ff2cd7 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. diff --git a/cpp/src/IceBox/ServiceManagerI.h b/cpp/src/IceBox/ServiceManagerI.h index 85a115d7b5f..dd56621ac3f 100644 --- a/cpp/src/IceBox/ServiceManagerI.h +++ b/cpp/src/IceBox/ServiceManagerI.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2017 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. |