You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2013/12/30 18:17:53 UTC
svn commit: r1554280 - in /cxf/branches/2.6.x-fixes: ./
rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist.css
rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/servicelist.css
Author: sergeyb
Date: Mon Dec 30 17:17:53 2013
New Revision: 1554280
URL: http://svn.apache.org/r1554280
Log:
Merged revisions 1554279 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................
r1554279 | sergeyb | 2013-12-30 17:11:55 +0000 (Mon, 30 Dec 2013) | 9 lines
Merged revisions 1554278 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1554278 | sergeyb | 2013-12-30 17:08:29 +0000 (Mon, 30 Dec 2013) | 1 line
[CXF-5362] Moving servicelist.css resource to the package where it is actually used
........
................
Added:
cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/servicelist.css
- copied unchanged from r1554279, cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/servicelist.css
Removed:
cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist.css
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Dec 30 17:17:53 2013
@@ -0,0 +1,2 @@
+/cxf/branches/2.7.x-fixes:1554279
+/cxf/trunk:1554278
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.