Repository: cxf Updated Branches: refs/heads/2.6.x-fixes bf8fea668 -> 251181dd7
Recording .gitmergeinfo Changes Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/251181dd Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/251181dd Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/251181dd Branch: refs/heads/2.6.x-fixes Commit: 251181dd7d058bb1c03ff63b5b392909b4f97c2c Parents: bf8fea6 Author: Daniel Kulp <dk...@apache.org> Authored: Tue Jul 15 10:54:05 2014 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Tue Jul 15 10:54:05 2014 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/251181dd/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index f817e47..af5d88e 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -60,6 +60,7 @@ B 0b4ca06c0f92f23365e3238d9fa32bbb3e3fa9ce B 0b6213fa25f0dcb7c4ccd1fb3b5c5cc4e36c7936 B 0b9b72228ce587b9c799a2ef4d43f56fda58464f B 0bdb39c3212b2da1a804dfb5b2910698d5e8272d +B 0bf7ead591ad4a751e7e9770afa29058b1d54df6 B 0c1f6d5c7c11cf111eb66aae9e59f4501436192f B 0c4be3310e713b61468852278dd59338aa0c59c3 B 0c568fd4debd56d66c1d9919c0fcae3101b3d260 @@ -198,6 +199,7 @@ B 2be20f00d61bdab039af20ae2e8fec66774f8425 B 2be3af700bcd3b956297dfe925546faccb60ef0b B 2c1b1627a412eadd72d51e2058a34a7a4a86f8e4 B 2cc9940cc9f82306bd59119b25fc73dc7d122d28 +B 2ce38563c3ad6ac7a927c9e4e1315a4a774f8ab2 B 2ce97ef16ad6ac314637038c645426a6440f8f53 B 2d09de9d0322abb170249e18c1ec41ae1c007d5f B 2d1ffc6d1bfc2148b714b5715e0f6388e7c5f5e8 @@ -1155,10 +1157,12 @@ B ef54d591ce352bd8a9b3265e80f013fa415bd5a1 B ef81d6ad768f7d8e1537a160932b4a217b248f18 B efab7f0635d28a16d6a80ff3c17a30f2393cf01a B efe316ea0b84a59de5d48b920997fde8af777eea +B f02aee092c84d426a024ea39a2688a43fc98f866 B f063d162bed28d2ef488d37472d2fcebf870a817 B f11cac362fb579a29cb81afc9358de0e51e742a0 B f12e0208be8209df34161b8e3fdd0f397578ace9 B f16ce3193b5bb7603082db9328f185d3b2638485 +B f1a0adf9ef335d50b53a7279390f35abf9a36c5a B f1a819f5825436eb36976c73d02e5649f0052c3c B f1f5f9884b2090d09e8784225779ce02a41e3e7e B f1fd8cba0d76390ea6f4b421080ea02f661aefdd
