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/android | |
| 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/android')
| -rw-r--r-- | java/test/android/res/raw/client.bks | bin | 3633 -> 3633 bytes | |||
| -rw-r--r-- | java/test/android/res/raw/server.bks | bin | 3639 -> 3639 bytes | |||
| -rw-r--r-- | java/test/android/src/com/zeroc/testsuite/TestApp.java | 2 | ||||
| -rw-r--r-- | java/test/android/src/com/zeroc/testsuite/TestContainer.java | 2 | ||||
| -rw-r--r-- | java/test/android/src/com/zeroc/testsuite/TestSuite.java | 2 |
5 files changed, 3 insertions, 3 deletions
diff --git a/java/test/android/res/raw/client.bks b/java/test/android/res/raw/client.bks Binary files differindex b1f4d3f0a6a..538d360fac0 100644 --- a/java/test/android/res/raw/client.bks +++ b/java/test/android/res/raw/client.bks diff --git a/java/test/android/res/raw/server.bks b/java/test/android/res/raw/server.bks Binary files differindex 276f19e74a6..1216ff6f26d 100644 --- a/java/test/android/res/raw/server.bks +++ b/java/test/android/res/raw/server.bks diff --git a/java/test/android/src/com/zeroc/testsuite/TestApp.java b/java/test/android/src/com/zeroc/testsuite/TestApp.java index 09cccd8ea4d..811d8060f44 100644 --- a/java/test/android/src/com/zeroc/testsuite/TestApp.java +++ b/java/test/android/src/com/zeroc/testsuite/TestApp.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/android/src/com/zeroc/testsuite/TestContainer.java b/java/test/android/src/com/zeroc/testsuite/TestContainer.java index a9885c724b4..0c9dacbaf69 100644 --- a/java/test/android/src/com/zeroc/testsuite/TestContainer.java +++ b/java/test/android/src/com/zeroc/testsuite/TestContainer.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/android/src/com/zeroc/testsuite/TestSuite.java b/java/test/android/src/com/zeroc/testsuite/TestSuite.java index 8d4c46bada7..0b0a1178d6f 100644 --- a/java/test/android/src/com/zeroc/testsuite/TestSuite.java +++ b/java/test/android/src/com/zeroc/testsuite/TestSuite.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. |