You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/01/13 19:29:34 UTC
svn commit: r1231227 - in /cxf/branches/2.5.x-fixes: ./
rt/javascript/javascript-rt/ rt/javascript/javascript-tests/
systests/ws-security-examples/
Author: dkulp
Date: Fri Jan 13 18:29:33 2012
New Revision: 1231227
URL: http://svn.apache.org/viewvc?rev=1231227&view=rev
Log:
Merged revisions 1228209 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1228209 | dkulp | 2012-01-06 09:46:34 -0500 (Fri, 06 Jan 2012) | 2 lines
Set svn:ignore properties
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/rt/javascript/javascript-rt/ (props changed)
cxf/branches/2.5.x-fixes/rt/javascript/javascript-tests/ (props changed)
cxf/branches/2.5.x-fixes/systests/ws-security-examples/ (props changed)
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 13 18:29:33 2012
@@ -1 +1 @@
-/cxf/trunk:1-1227739,1227823,1229663,1229965,1230800
+/cxf/trunk:1-1227739,1227823,1228209,1229663,1229965,1230800
Propchange: cxf/branches/2.5.x-fixes/rt/javascript/javascript-rt/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jan 13 18:29:33 2012
@@ -1 +1,16 @@
+.pmd
+.checkstyle
+.ruleset
target
+.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws
Propchange: cxf/branches/2.5.x-fixes/rt/javascript/javascript-tests/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jan 13 18:29:33 2012
@@ -1 +1,16 @@
+.pmd
+.checkstyle
+.ruleset
target
+.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws
Propchange: cxf/branches/2.5.x-fixes/systests/ws-security-examples/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jan 13 18:29:33 2012
@@ -1 +1,16 @@
+.pmd
+.checkstyle
+.ruleset
target
+.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws