Author: dkulp
Date: Mon Aug 8 17:11:41 2011
New Revision: 1155017
URL: http://svn.apache.org/viewvc?rev=1155017&view=rev
Log:
Merged revisions 1146653 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x
........
r1146653 | janstey | 2011-07-14 07:17:38 -0400 (Thu, 14 Jul 2011) | 1 line
update copyright date
........
Modified:
camel/branches/camel-2.7.x/ (props changed)
camel/branches/camel-2.7.x/apache-camel/src/main/release/NOTICE.txt
Propchange: camel/branches/camel-2.7.x/
('svn:mergeinfo' removed)
Propchange: camel/branches/camel-2.7.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Aug 8 17:11:41 2011
@@ -1 +1 @@
-/camel/branches/camel-2.8.x:1-1146127
+/camel/branches/camel-2.8.x:1-1146127,1146653
Modified: camel/branches/camel-2.7.x/apache-camel/src/main/release/NOTICE.txt
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/apache-camel/src/main/release/NOTICE.txt?rev=1155017&r1=1155016&r2=1155017&view=diff
==============================================================================
--- camel/branches/camel-2.7.x/apache-camel/src/main/release/NOTICE.txt
(original)
+++ camel/branches/camel-2.7.x/apache-camel/src/main/release/NOTICE.txt Mon Aug
8 17:11:41 2011
@@ -5,7 +5,7 @@
=========================================================================
Apache Camel
-Copyright 2007-2010 The Apache Software Foundation
+Copyright 2007-2011 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
