diff options
| author | Joe George <joe@zeroc.com> | 2016-03-01 10:04:29 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-03-01 10:04:29 -0500 |
| commit | 7f1a8fd1c57d349d288989365ad18af7566cfcee (patch) | |
| tree | e32fe85f6035913517187db3894dd45b17534f08 /csharp/test/Ice/threadPoolPriority | |
| parent | Ice::identityToString/Ice::stringToIdentity for PHP7 (diff) | |
| parent | Update copyright headers (diff) | |
| download | ice-7f1a8fd1c57d349d288989365ad18af7566cfcee.tar.bz2 ice-7f1a8fd1c57d349d288989365ad18af7566cfcee.tar.xz ice-7f1a8fd1c57d349d288989365ad18af7566cfcee.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'csharp/test/Ice/threadPoolPriority')
| -rw-r--r-- | csharp/test/Ice/threadPoolPriority/Client.cs | 2 | ||||
| -rw-r--r-- | csharp/test/Ice/threadPoolPriority/Makefile | 2 | ||||
| -rw-r--r-- | csharp/test/Ice/threadPoolPriority/Makefile.mak | 2 | ||||
| -rw-r--r-- | csharp/test/Ice/threadPoolPriority/PriorityI.cs | 2 | ||||
| -rw-r--r-- | csharp/test/Ice/threadPoolPriority/Server.cs | 2 | ||||
| -rw-r--r-- | csharp/test/Ice/threadPoolPriority/Test.ice | 2 | ||||
| -rw-r--r-- | csharp/test/Ice/threadPoolPriority/run.py | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/csharp/test/Ice/threadPoolPriority/Client.cs b/csharp/test/Ice/threadPoolPriority/Client.cs index f8120e4595f..54f503c3dbd 100644 --- a/csharp/test/Ice/threadPoolPriority/Client.cs +++ b/csharp/test/Ice/threadPoolPriority/Client.cs @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-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. diff --git a/csharp/test/Ice/threadPoolPriority/Makefile b/csharp/test/Ice/threadPoolPriority/Makefile index fdc5056c73a..b8b247f616e 100644 --- a/csharp/test/Ice/threadPoolPriority/Makefile +++ b/csharp/test/Ice/threadPoolPriority/Makefile @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-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. diff --git a/csharp/test/Ice/threadPoolPriority/Makefile.mak b/csharp/test/Ice/threadPoolPriority/Makefile.mak index 81831b65ad1..4a03d5e122a 100644 --- a/csharp/test/Ice/threadPoolPriority/Makefile.mak +++ b/csharp/test/Ice/threadPoolPriority/Makefile.mak @@ -1,6 +1,6 @@ # ********************************************************************** # -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-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. diff --git a/csharp/test/Ice/threadPoolPriority/PriorityI.cs b/csharp/test/Ice/threadPoolPriority/PriorityI.cs index fc1128223f9..59991497612 100644 --- a/csharp/test/Ice/threadPoolPriority/PriorityI.cs +++ b/csharp/test/Ice/threadPoolPriority/PriorityI.cs @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-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. diff --git a/csharp/test/Ice/threadPoolPriority/Server.cs b/csharp/test/Ice/threadPoolPriority/Server.cs index 4f88a4ede19..1a8c1c2a613 100644 --- a/csharp/test/Ice/threadPoolPriority/Server.cs +++ b/csharp/test/Ice/threadPoolPriority/Server.cs @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-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. diff --git a/csharp/test/Ice/threadPoolPriority/Test.ice b/csharp/test/Ice/threadPoolPriority/Test.ice index d6e2a3861b5..52b797705fd 100644 --- a/csharp/test/Ice/threadPoolPriority/Test.ice +++ b/csharp/test/Ice/threadPoolPriority/Test.ice @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-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. diff --git a/csharp/test/Ice/threadPoolPriority/run.py b/csharp/test/Ice/threadPoolPriority/run.py index 5c9bb399cb3..bfec815018d 100644 --- a/csharp/test/Ice/threadPoolPriority/run.py +++ b/csharp/test/Ice/threadPoolPriority/run.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-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. |