Author: dkulp
Date: Wed Oct 8 06:38:40 2008
New Revision: 702872
URL: http://svn.apache.org/viewvc?rev=702872&view=rev
Log:
Merged revisions 702653 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r702653 | peterjones | 2008-10-07 17:58:13 -0400 (Tue, 07 Oct 2008) | 2 lines
CXF-1845. Couple of files missed being added for ibmjdk test fix commit.
........
Added:
cxf/branches/2.1.x-fixes/tools/corba/src/test/resources/idlgen/expected_multiplebinding_ibmjdk.idl
- copied unchanged from r702653,
cxf/trunk/tools/corba/src/test/resources/idlgen/expected_multiplebinding_ibmjdk.idl
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 8 06:38:40 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
