You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/09/10 12:16:45 UTC
svn commit: r1167488 - in /camel/branches/camel-2.8.x: ./
apache-camel/src/main/descriptors/unix-bin.xml
apache-camel/src/main/descriptors/windows-bin.xml
Author: davsclaus
Date: Sat Sep 10 10:16:45 2011
New Revision: 1167488
URL: http://svn.apache.org/viewvc?rev=1167488&view=rev
Log:
Merged revisions 1167487 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/apache-camel/src/main/descriptors/unix-bin.xml
camel/branches/camel-2.8.x/apache-camel/src/main/descriptors/windows-bin.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 10 10:16:45 2011
@@ -1 +1 @@
-/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163231,1163420,1164557,1164633,1164973-1165000,1165152,1165157,1165658,1165971,1165987,1167098,1167131,1167448
+/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163231,1163420,1164557,1164633,1164973-1165000,1165152,1165157,1165658,1165971,1165987,1167098,1167131,1167448,1167487
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/apache-camel/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/apache-camel/src/main/descriptors/unix-bin.xml?rev=1167488&r1=1167487&r2=1167488&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/apache-camel/src/main/descriptors/unix-bin.xml (original)
+++ camel/branches/camel-2.8.x/apache-camel/src/main/descriptors/unix-bin.xml Sat Sep 10 10:16:45 2011
@@ -38,7 +38,7 @@
<outputDirectory>/examples</outputDirectory>
<excludes>
<!-- disable build, IDEA and Eclipse files -->
- <exclude>**/*.i*</exclude>
+ <exclude>**/*.i??</exclude>
<exclude>**/eclipse-classes/**</exclude>
<exclude>**/.project</exclude>
<exclude>**/.classpath</exclude>
Modified: camel/branches/camel-2.8.x/apache-camel/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/apache-camel/src/main/descriptors/windows-bin.xml?rev=1167488&r1=1167487&r2=1167488&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/apache-camel/src/main/descriptors/windows-bin.xml (original)
+++ camel/branches/camel-2.8.x/apache-camel/src/main/descriptors/windows-bin.xml Sat Sep 10 10:16:45 2011
@@ -38,7 +38,7 @@
<outputDirectory>/examples</outputDirectory>
<excludes>
<!-- disable build, IDEA and Eclipse files -->
- <exclude>**/*.i*</exclude>
+ <exclude>**/*.i??</exclude>
<exclude>**/eclipse-classes/**</exclude>
<exclude>**/.project</exclude>
<exclude>**/.classpath</exclude>