Author: sergeyb
Date: Wed Mar 17 14:57:21 2010
New Revision: 924320
URL: http://svn.apache.org/viewvc?rev=924320&view=rev
Log:
Merged revisions 924313 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r924313 | sergeyb | 2010-03-17 14:40:34 +0000 (Wed, 17 Mar 2010) | 1 line
Adding a missing test resource
........
Added:
cxf/branches/2.2.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/attachmentFormJsonJaxbEncoded
- copied unchanged from r924313,
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/attachmentFormJsonJaxbEncoded
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 17 14:57:21 2010
@@ -1 +1 @@
-/cxf/trunk:924306
+/cxf/trunk:924306,924313
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
