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/test/Ice/acm | |
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/test/Ice/acm')
-rw-r--r-- | objective-c/test/Ice/acm/ACMTest.ice | 2 | ||||
-rw-r--r-- | objective-c/test/Ice/acm/AllTests.m | 2 | ||||
-rw-r--r-- | objective-c/test/Ice/acm/Client.m | 2 | ||||
-rw-r--r-- | objective-c/test/Ice/acm/Server.m | 2 | ||||
-rw-r--r-- | objective-c/test/Ice/acm/TestI.h | 2 | ||||
-rw-r--r-- | objective-c/test/Ice/acm/TestI.m | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/objective-c/test/Ice/acm/ACMTest.ice b/objective-c/test/Ice/acm/ACMTest.ice index a8f40466fc5..3af340f03fa 100644 --- a/objective-c/test/Ice/acm/ACMTest.ice +++ b/objective-c/test/Ice/acm/ACMTest.ice @@ -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/test/Ice/acm/AllTests.m b/objective-c/test/Ice/acm/AllTests.m index 9bc99ccd214..74fb0705e78 100644 --- a/objective-c/test/Ice/acm/AllTests.m +++ b/objective-c/test/Ice/acm/AllTests.m @@ -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/test/Ice/acm/Client.m b/objective-c/test/Ice/acm/Client.m index 454c195f13e..ce4ab06ff3b 100644 --- a/objective-c/test/Ice/acm/Client.m +++ b/objective-c/test/Ice/acm/Client.m @@ -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/test/Ice/acm/Server.m b/objective-c/test/Ice/acm/Server.m index 19bec1af80f..d174502df00 100644 --- a/objective-c/test/Ice/acm/Server.m +++ b/objective-c/test/Ice/acm/Server.m @@ -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/test/Ice/acm/TestI.h b/objective-c/test/Ice/acm/TestI.h index dae53054503..1a8f30e174f 100644 --- a/objective-c/test/Ice/acm/TestI.h +++ b/objective-c/test/Ice/acm/TestI.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/test/Ice/acm/TestI.m b/objective-c/test/Ice/acm/TestI.m index 792c5bc5cb2..2d0cde338fe 100644 --- a/objective-c/test/Ice/acm/TestI.m +++ b/objective-c/test/Ice/acm/TestI.m @@ -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. |