Merge branch 'R3_3_branch' of cvs:/home/git/ice into R3_3_branch

Conflicts:

	java/resources/IceGridAdmin/icegridadmin_content_dyn.html
	java/resources/IceGridAdmin/icegridadmin_content_static.html

9 files changed, 9 insertions, 9 deletions

diff --git a/cpp/demo/Database/Oracle/proc/Client.cpp b/cpp/demo/Database/Oracle/proc/Client.cpp
index 8488e96716b..61f88894ba4 100644
--- a/cpp/demo/Database/Oracle/proc/Client.cpp
+++ b/cpp/demo/Database/Oracle/proc/Client.cpp
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/demo/Database/Oracle/proc/CurrentSqlContext.h b/cpp/demo/Database/Oracle/proc/CurrentSqlContext.h
index 93527f1e103..53efc43e160 100644
--- a/cpp/demo/Database/Oracle/proc/CurrentSqlContext.h
+++ b/cpp/demo/Database/Oracle/proc/CurrentSqlContext.h
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/demo/Database/Oracle/proc/DeptFactoryI.h b/cpp/demo/Database/Oracle/proc/DeptFactoryI.h
index 1b4b6741f05..17f16d8f77a 100644
--- a/cpp/demo/Database/Oracle/proc/DeptFactoryI.h
+++ b/cpp/demo/Database/Oracle/proc/DeptFactoryI.h
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/demo/Database/Oracle/proc/DeptI.h b/cpp/demo/Database/Oracle/proc/DeptI.h
index e290f2f7156..bb2dc3db57f 100644
--- a/cpp/demo/Database/Oracle/proc/DeptI.h
+++ b/cpp/demo/Database/Oracle/proc/DeptI.h
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/demo/Database/Oracle/proc/EmpI.h b/cpp/demo/Database/Oracle/proc/EmpI.h
index 253f964ba5e..8be55746949 100644
--- a/cpp/demo/Database/Oracle/proc/EmpI.h
+++ b/cpp/demo/Database/Oracle/proc/EmpI.h
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/demo/Database/Oracle/proc/HR.ice b/cpp/demo/Database/Oracle/proc/HR.ice
index 760760801dc..5448efbefb7 100644
--- a/cpp/demo/Database/Oracle/proc/HR.ice
+++ b/cpp/demo/Database/Oracle/proc/HR.ice
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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/demo/Database/Oracle/proc/Makefile b/cpp/demo/Database/Oracle/proc/Makefile
index 7f8903d0ec8..725c70b203c 100644
--- a/cpp/demo/Database/Oracle/proc/Makefile
+++ b/cpp/demo/Database/Oracle/proc/Makefile
@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 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/demo/Database/Oracle/proc/Makefile.mak b/cpp/demo/Database/Oracle/proc/Makefile.mak
index e8eb6b88955..3587f6f20bb 100644
--- a/cpp/demo/Database/Oracle/proc/Makefile.mak
+++ b/cpp/demo/Database/Oracle/proc/Makefile.mak
@@ -1,6 +1,6 @@
 # **********************************************************************

 #

-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.

+# Copyright (c) 2003-2009 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/demo/Database/Oracle/proc/Util.h b/cpp/demo/Database/Oracle/proc/Util.h
index d4e537f9693..ea9a41ea192 100644
--- a/cpp/demo/Database/Oracle/proc/Util.h
+++ b/cpp/demo/Database/Oracle/proc/Util.h
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 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.