Author: ningjiang
Date: Tue Apr 23 00:42:59 2013
New Revision: 1470762
URL: http://svn.apache.org/r1470762
Log:
Merged revisions 1469704 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1469704 | davsclaus | 2013-04-19 13:47:25 +0800 (Fri, 19 Apr 2013) | 1 line
Updated (c) to 2007-2013
........
Modified:
camel/branches/camel-2.11.x/ (props changed)
camel/branches/camel-2.11.x/apache-camel/src/main/release/NOTICE.txt
camel/branches/camel-2.11.x/apache-camel/src/main/resources/META-INF/NOTICE.txt
camel/branches/camel-2.11.x/components/camel-http/ (props changed)
camel/branches/camel-2.11.x/components/camel-jms/ (props changed)
Propchange: camel/branches/camel-2.11.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1469704
Propchange: camel/branches/camel-2.11.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr 23 00:42:59 2013
@@ -1 +1 @@
-/camel/trunk:1-1468763,1469819,1470420,1470426-1470427,1470429,1470508
+/camel/trunk:1-1468763,1469704,1469819,1470420,1470426-1470427,1470429,1470508
Modified: camel/branches/camel-2.11.x/apache-camel/src/main/release/NOTICE.txt
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/apache-camel/src/main/release/NOTICE.txt?rev=1470762&r1=1470761&r2=1470762&view=diff
==============================================================================
--- camel/branches/camel-2.11.x/apache-camel/src/main/release/NOTICE.txt
(original)
+++ camel/branches/camel-2.11.x/apache-camel/src/main/release/NOTICE.txt Tue
Apr 23 00:42:59 2013
@@ -5,7 +5,7 @@
=========================================================================
Apache Camel
-Copyright 2007-2012 The Apache Software Foundation
+Copyright 2007-2013 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified:
camel/branches/camel-2.11.x/apache-camel/src/main/resources/META-INF/NOTICE.txt
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/apache-camel/src/main/resources/META-INF/NOTICE.txt?rev=1470762&r1=1470761&r2=1470762&view=diff
==============================================================================
---
camel/branches/camel-2.11.x/apache-camel/src/main/resources/META-INF/NOTICE.txt
(original)
+++
camel/branches/camel-2.11.x/apache-camel/src/main/resources/META-INF/NOTICE.txt
Tue Apr 23 00:42:59 2013
@@ -5,7 +5,7 @@
=========================================================================
Apache Camel
-Copyright 2005-2006 The Apache Software Foundation
+Copyright 2007-2013 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Propchange: camel/branches/camel-2.11.x/components/camel-http/
------------------------------------------------------------------------------
Merged /camel/trunk/components/camel-http:r1469704
Propchange: camel/branches/camel-2.11.x/components/camel-jms/
------------------------------------------------------------------------------
Merged /camel/trunk/components/camel-jms:r1469704
