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 /cpp/src/slice2html | |
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 'cpp/src/slice2html')
-rw-r--r-- | cpp/src/slice2html/Gen.cpp | 2 | ||||
-rw-r--r-- | cpp/src/slice2html/Gen.h | 2 | ||||
-rw-r--r-- | cpp/src/slice2html/Main.cpp | 2 | ||||
-rw-r--r-- | cpp/src/slice2html/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp index 6b14877959b..e7cdbdaa35a 100644 --- a/cpp/src/slice2html/Gen.cpp +++ b/cpp/src/slice2html/Gen.cpp @@ -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/cpp/src/slice2html/Gen.h b/cpp/src/slice2html/Gen.h index a616f8e409a..42723b8fa65 100644 --- a/cpp/src/slice2html/Gen.h +++ b/cpp/src/slice2html/Gen.h @@ -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/cpp/src/slice2html/Main.cpp b/cpp/src/slice2html/Main.cpp index 905bb773a0c..daa2493cda0 100644 --- a/cpp/src/slice2html/Main.cpp +++ b/cpp/src/slice2html/Main.cpp @@ -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/cpp/src/slice2html/Makefile b/cpp/src/slice2html/Makefile index 47f2177d6f0..8b8b40307a5 100644 --- a/cpp/src/slice2html/Makefile +++ b/cpp/src/slice2html/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. |