Author: dkulp
Date: Fri Jun 17 16:58:51 2011
New Revision: 1136934
URL: http://svn.apache.org/viewvc?rev=1136934&view=rev
Log:
Merged revisions 1134526 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1134526 | cschneider | 2011-06-11 02:12:55 -0400 (Sat, 11 Jun 2011) | 1 line
Ignore target in svn
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/logbrowser/
(props changed)
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/sts_issue_operation/
(props changed)
Propchange: cxf/branches/2.4.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun 17 16:58:51 2011
@@ -1 +1 @@
-/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1135457,1135484,1135899,1136380,1136417,1136860
+/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1134526,1135457,1135484,1135899,1136380,1136417,1136860
Propchange:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/logbrowser/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jun 17 16:58:51 2011
@@ -0,0 +1 @@
+target
Propchange:
cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/sts_issue_operation/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jun 17 16:58:51 2011
@@ -0,0 +1 @@
+target
