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 /protobuf/demo/cpp | |
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 'protobuf/demo/cpp')
-rw-r--r-- | protobuf/demo/cpp/Client.cpp | 2 | ||||
-rw-r--r-- | protobuf/demo/cpp/Hello.ice | 2 | ||||
-rw-r--r-- | protobuf/demo/cpp/HelloI.cpp | 2 | ||||
-rw-r--r-- | protobuf/demo/cpp/HelloI.h | 2 | ||||
-rw-r--r-- | protobuf/demo/cpp/Makefile | 2 | ||||
-rw-r--r-- | protobuf/demo/cpp/Makefile.mak | 2 | ||||
-rw-r--r-- | protobuf/demo/cpp/Person.proto | 2 | ||||
-rw-r--r-- | protobuf/demo/cpp/Server.cpp | 2 | ||||
-rw-r--r-- | protobuf/demo/cpp/StreamProtobuf.h | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/protobuf/demo/cpp/Client.cpp b/protobuf/demo/cpp/Client.cpp index 61b238d53ab..bcca15d8b31 100644 --- a/protobuf/demo/cpp/Client.cpp +++ b/protobuf/demo/cpp/Client.cpp @@ -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 Protobuf is licensed to you under the terms // described in the ICE_PROTOBUF_LICENSE file included in this diff --git a/protobuf/demo/cpp/Hello.ice b/protobuf/demo/cpp/Hello.ice index 4acc0b046d9..8d094f31ef7 100644 --- a/protobuf/demo/cpp/Hello.ice +++ b/protobuf/demo/cpp/Hello.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 Protobuf is licensed to you under the terms // described in the ICE_PROTOBUF_LICENSE file included in this diff --git a/protobuf/demo/cpp/HelloI.cpp b/protobuf/demo/cpp/HelloI.cpp index dfd9864c99f..5415eab2557 100644 --- a/protobuf/demo/cpp/HelloI.cpp +++ b/protobuf/demo/cpp/HelloI.cpp @@ -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 Protobuf is licensed to you under the terms // described in the ICE_PROTOBUF_LICENSE file included in this diff --git a/protobuf/demo/cpp/HelloI.h b/protobuf/demo/cpp/HelloI.h index 2a0809cbcdb..7db19c9071d 100644 --- a/protobuf/demo/cpp/HelloI.h +++ b/protobuf/demo/cpp/HelloI.h @@ -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 Protobuf is licensed to you under the terms // described in the ICE_PROTOBUF_LICENSE file included in this diff --git a/protobuf/demo/cpp/Makefile b/protobuf/demo/cpp/Makefile index d63c5fd3a6c..8f71533c289 100644 --- a/protobuf/demo/cpp/Makefile +++ b/protobuf/demo/cpp/Makefile @@ -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 Protobuf is licensed to you under the terms # described in the ICE_PROTOBUF_LICENSE file included in this diff --git a/protobuf/demo/cpp/Makefile.mak b/protobuf/demo/cpp/Makefile.mak index 4c886bd91d7..f361cae0846 100644 --- a/protobuf/demo/cpp/Makefile.mak +++ b/protobuf/demo/cpp/Makefile.mak @@ -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 Protobuf is licensed to you under the terms # described in the ICE_PROTOBUF_LICENSE file included in this diff --git a/protobuf/demo/cpp/Person.proto b/protobuf/demo/cpp/Person.proto index c512c800570..d69651f418f 100644 --- a/protobuf/demo/cpp/Person.proto +++ b/protobuf/demo/cpp/Person.proto @@ -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 Protobuf is licensed to you under the terms // described in the ICE_PROTOBUF_LICENSE file included in this diff --git a/protobuf/demo/cpp/Server.cpp b/protobuf/demo/cpp/Server.cpp index c6202344ee8..4f2c200c6ff 100644 --- a/protobuf/demo/cpp/Server.cpp +++ b/protobuf/demo/cpp/Server.cpp @@ -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 Protobuf is licensed to you under the terms // described in the ICE_PROTOBUF_LICENSE file included in this diff --git a/protobuf/demo/cpp/StreamProtobuf.h b/protobuf/demo/cpp/StreamProtobuf.h index ff2bfd665a9..fbe3f2d02aa 100644 --- a/protobuf/demo/cpp/StreamProtobuf.h +++ b/protobuf/demo/cpp/StreamProtobuf.h @@ -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 Protobuf is licensed to you under the terms // described in the ICE_PROTOBUF_LICENSE file included in this |