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 /objective-c/include/objc/Ice | |
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 'objective-c/include/objc/Ice')
-rw-r--r-- | objective-c/include/objc/Ice/Config.h | 2 | ||||
-rw-r--r-- | objective-c/include/objc/Ice/DispatchInterceptor.h | 2 | ||||
-rw-r--r-- | objective-c/include/objc/Ice/Exception.h | 2 | ||||
-rw-r--r-- | objective-c/include/objc/Ice/Format.h | 2 | ||||
-rw-r--r-- | objective-c/include/objc/Ice/Ice.h | 2 | ||||
-rw-r--r-- | objective-c/include/objc/Ice/Initialize.h | 2 | ||||
-rw-r--r-- | objective-c/include/objc/Ice/LocalObject.h | 2 | ||||
-rw-r--r-- | objective-c/include/objc/Ice/NativePropertiesAdmin.h | 2 | ||||
-rw-r--r-- | objective-c/include/objc/Ice/Object.h | 2 | ||||
-rw-r--r-- | objective-c/include/objc/Ice/ObjectFactory.h | 2 | ||||
-rw-r--r-- | objective-c/include/objc/Ice/Proxy.h | 2 | ||||
-rw-r--r-- | objective-c/include/objc/Ice/SlicedData.h | 2 | ||||
-rw-r--r-- | objective-c/include/objc/Ice/Stream.h | 2 |
13 files changed, 13 insertions, 13 deletions
diff --git a/objective-c/include/objc/Ice/Config.h b/objective-c/include/objc/Ice/Config.h index 03b37a8d5a0..98efccf4531 100644 --- a/objective-c/include/objc/Ice/Config.h +++ b/objective-c/include/objc/Ice/Config.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. diff --git a/objective-c/include/objc/Ice/DispatchInterceptor.h b/objective-c/include/objc/Ice/DispatchInterceptor.h index 249d5325757..97a86906c13 100644 --- a/objective-c/include/objc/Ice/DispatchInterceptor.h +++ b/objective-c/include/objc/Ice/DispatchInterceptor.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. diff --git a/objective-c/include/objc/Ice/Exception.h b/objective-c/include/objc/Ice/Exception.h index 4e344c90719..18d50d9ffbd 100644 --- a/objective-c/include/objc/Ice/Exception.h +++ b/objective-c/include/objc/Ice/Exception.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. diff --git a/objective-c/include/objc/Ice/Format.h b/objective-c/include/objc/Ice/Format.h index c63d0a2c725..00f54314af9 100644 --- a/objective-c/include/objc/Ice/Format.h +++ b/objective-c/include/objc/Ice/Format.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. diff --git a/objective-c/include/objc/Ice/Ice.h b/objective-c/include/objc/Ice/Ice.h index 46ab25a5820..a4e1371b905 100644 --- a/objective-c/include/objc/Ice/Ice.h +++ b/objective-c/include/objc/Ice/Ice.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. diff --git a/objective-c/include/objc/Ice/Initialize.h b/objective-c/include/objc/Ice/Initialize.h index 5095c4b772b..53cc7006e2c 100644 --- a/objective-c/include/objc/Ice/Initialize.h +++ b/objective-c/include/objc/Ice/Initialize.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. diff --git a/objective-c/include/objc/Ice/LocalObject.h b/objective-c/include/objc/Ice/LocalObject.h index e304f0ac40e..3413e799278 100644 --- a/objective-c/include/objc/Ice/LocalObject.h +++ b/objective-c/include/objc/Ice/LocalObject.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. diff --git a/objective-c/include/objc/Ice/NativePropertiesAdmin.h b/objective-c/include/objc/Ice/NativePropertiesAdmin.h index f08f6aaddda..c715a271ff8 100644 --- a/objective-c/include/objc/Ice/NativePropertiesAdmin.h +++ b/objective-c/include/objc/Ice/NativePropertiesAdmin.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. diff --git a/objective-c/include/objc/Ice/Object.h b/objective-c/include/objc/Ice/Object.h index a464c2ba8f7..8ae9ad8f17f 100644 --- a/objective-c/include/objc/Ice/Object.h +++ b/objective-c/include/objc/Ice/Object.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. diff --git a/objective-c/include/objc/Ice/ObjectFactory.h b/objective-c/include/objc/Ice/ObjectFactory.h index 644d1b50288..74bad6cde75 100644 --- a/objective-c/include/objc/Ice/ObjectFactory.h +++ b/objective-c/include/objc/Ice/ObjectFactory.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. diff --git a/objective-c/include/objc/Ice/Proxy.h b/objective-c/include/objc/Ice/Proxy.h index 31593be8f30..79dbf98eecb 100644 --- a/objective-c/include/objc/Ice/Proxy.h +++ b/objective-c/include/objc/Ice/Proxy.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. diff --git a/objective-c/include/objc/Ice/SlicedData.h b/objective-c/include/objc/Ice/SlicedData.h index f30f2521e70..1dacba245c9 100644 --- a/objective-c/include/objc/Ice/SlicedData.h +++ b/objective-c/include/objc/Ice/SlicedData.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. diff --git a/objective-c/include/objc/Ice/Stream.h b/objective-c/include/objc/Ice/Stream.h index 0d22feb4725..b02cc74bd55 100644 --- a/objective-c/include/objc/Ice/Stream.h +++ b/objective-c/include/objc/Ice/Stream.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. |