summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2016-03-07 15:38:35 -0500
committerJoe George <joe@zeroc.com>2016-03-07 15:38:35 -0500
commit849f8911b1075548e5bef8f63bd76e32a27e5b07 (patch)
tree45a76dcb065cdaf92c1b6cb192d97bf35f095ac0 /cpp
parentMerge remote-tracking branch 'origin/3.6' (diff)
parentMore Copyright year updates (diff)
downloadice-849f8911b1075548e5bef8f63bd76e32a27e5b07.tar.bz2
ice-849f8911b1075548e5bef8f63bd76e32a27e5b07.tar.xz
ice-849f8911b1075548e5bef8f63bd76e32a27e5b07.zip
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp')
-rwxr-xr-xcpp/test/IceSSL/certs/makecerts.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/test/IceSSL/certs/makecerts.py b/cpp/test/IceSSL/certs/makecerts.py
index 4cc8d428e7c..58e1e9cbe88 100755
--- a/cpp/test/IceSSL/certs/makecerts.py
+++ b/cpp/test/IceSSL/certs/makecerts.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2015 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2015-2016 ZeroC, Inc. All rights reserved.
#
# **********************************************************************