diff options
author | Mark Spruiell <mes@zeroc.com> | 2014-03-19 12:45:55 -0700 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2014-03-19 12:45:55 -0700 |
commit | cdcffbcc3c3c052afdeb772ff0167e7a90b525bb (patch) | |
tree | 4f16ee41ef7d33394c44e9db81e4d6cd89908250 /java/test/Ice/inheritance | |
parent | fixing testicedist.py for 5487 (diff) | |
download | ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.tar.bz2 ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.tar.xz ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.zip |
merging javascript branch
Diffstat (limited to 'java/test/Ice/inheritance')
-rw-r--r-- | java/test/Ice/inheritance/AllTests.java | 2 | ||||
-rw-r--r-- | java/test/Ice/inheritance/CAI.java | 2 | ||||
-rw-r--r-- | java/test/Ice/inheritance/CBI.java | 2 | ||||
-rw-r--r-- | java/test/Ice/inheritance/CCI.java | 2 | ||||
-rw-r--r-- | java/test/Ice/inheritance/CDI.java | 2 | ||||
-rw-r--r-- | java/test/Ice/inheritance/Client.java | 2 | ||||
-rw-r--r-- | java/test/Ice/inheritance/Collocated.java | 2 | ||||
-rw-r--r-- | java/test/Ice/inheritance/IAI.java | 2 | ||||
-rw-r--r-- | java/test/Ice/inheritance/IB1I.java | 2 | ||||
-rw-r--r-- | java/test/Ice/inheritance/IB2I.java | 2 | ||||
-rw-r--r-- | java/test/Ice/inheritance/ICI.java | 2 | ||||
-rw-r--r-- | java/test/Ice/inheritance/InitialI.java | 2 | ||||
-rw-r--r-- | java/test/Ice/inheritance/Server.java | 2 | ||||
-rw-r--r-- | java/test/Ice/inheritance/Test.ice | 2 | ||||
-rwxr-xr-x | java/test/Ice/inheritance/run.py | 2 |
15 files changed, 15 insertions, 15 deletions
diff --git a/java/test/Ice/inheritance/AllTests.java b/java/test/Ice/inheritance/AllTests.java index 7fcb05e4db6..2b5f9f93873 100644 --- a/java/test/Ice/inheritance/AllTests.java +++ b/java/test/Ice/inheritance/AllTests.java @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2014 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/java/test/Ice/inheritance/CAI.java b/java/test/Ice/inheritance/CAI.java index 685dca7f465..4db69aa0d0a 100644 --- a/java/test/Ice/inheritance/CAI.java +++ b/java/test/Ice/inheritance/CAI.java @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2014 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/java/test/Ice/inheritance/CBI.java b/java/test/Ice/inheritance/CBI.java index 698b20954e7..e6e8d9f7005 100644 --- a/java/test/Ice/inheritance/CBI.java +++ b/java/test/Ice/inheritance/CBI.java @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2014 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/java/test/Ice/inheritance/CCI.java b/java/test/Ice/inheritance/CCI.java index bc9a6a01241..3f737b246f6 100644 --- a/java/test/Ice/inheritance/CCI.java +++ b/java/test/Ice/inheritance/CCI.java @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2014 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/java/test/Ice/inheritance/CDI.java b/java/test/Ice/inheritance/CDI.java index d579ecc1608..6b21b135117 100644 --- a/java/test/Ice/inheritance/CDI.java +++ b/java/test/Ice/inheritance/CDI.java @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2014 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/java/test/Ice/inheritance/Client.java b/java/test/Ice/inheritance/Client.java index dc4456cb03d..f03d0917b5c 100644 --- a/java/test/Ice/inheritance/Client.java +++ b/java/test/Ice/inheritance/Client.java @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2014 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/java/test/Ice/inheritance/Collocated.java b/java/test/Ice/inheritance/Collocated.java index 61c21c28e89..af2bda6b221 100644 --- a/java/test/Ice/inheritance/Collocated.java +++ b/java/test/Ice/inheritance/Collocated.java @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2014 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/java/test/Ice/inheritance/IAI.java b/java/test/Ice/inheritance/IAI.java index f85367df36e..9d471939bb8 100644 --- a/java/test/Ice/inheritance/IAI.java +++ b/java/test/Ice/inheritance/IAI.java @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2014 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/java/test/Ice/inheritance/IB1I.java b/java/test/Ice/inheritance/IB1I.java index 8e76aac6a4b..b71b5e0451e 100644 --- a/java/test/Ice/inheritance/IB1I.java +++ b/java/test/Ice/inheritance/IB1I.java @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2014 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/java/test/Ice/inheritance/IB2I.java b/java/test/Ice/inheritance/IB2I.java index 91bf2279c38..d211349eedf 100644 --- a/java/test/Ice/inheritance/IB2I.java +++ b/java/test/Ice/inheritance/IB2I.java @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2014 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/java/test/Ice/inheritance/ICI.java b/java/test/Ice/inheritance/ICI.java index d588b364061..158553bf46b 100644 --- a/java/test/Ice/inheritance/ICI.java +++ b/java/test/Ice/inheritance/ICI.java @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2014 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/java/test/Ice/inheritance/InitialI.java b/java/test/Ice/inheritance/InitialI.java index bc898b04b8f..0c3195d7218 100644 --- a/java/test/Ice/inheritance/InitialI.java +++ b/java/test/Ice/inheritance/InitialI.java @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2014 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/java/test/Ice/inheritance/Server.java b/java/test/Ice/inheritance/Server.java index ea3d8b2a27f..b55b5213664 100644 --- a/java/test/Ice/inheritance/Server.java +++ b/java/test/Ice/inheritance/Server.java @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2014 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/java/test/Ice/inheritance/Test.ice b/java/test/Ice/inheritance/Test.ice index 776f5347b15..82d63b5078f 100644 --- a/java/test/Ice/inheritance/Test.ice +++ b/java/test/Ice/inheritance/Test.ice @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +// Copyright (c) 2003-2014 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/java/test/Ice/inheritance/run.py b/java/test/Ice/inheritance/run.py index e5f02b77a25..44aa7d73d00 100755 --- a/java/test/Ice/inheritance/run.py +++ b/java/test/Ice/inheritance/run.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # ********************************************************************** # -# Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved. +# Copyright (c) 2003-2014 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. |