Repository: cxf Updated Branches: refs/heads/2.6.x-fixes e9fd4dae5 -> acdbb0435
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/acdbb043 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/acdbb043 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/acdbb043 Branch: refs/heads/2.6.x-fixes Commit: acdbb0435aa50c9f776b239f94220d09fe303116 Parents: e9fd4da Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Mar 3 14:13:20 2014 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon Mar 3 14:13:20 2014 +0000 ---------------------------------------------------------------------- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/acdbb043/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 71033de..6a69fc9 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -193,6 +193,7 @@ B 3882494dc42f5b62b86d37404f1288edb3841938 B 389b0f7f8f7b032d299b7bf0972198f8a3efd08f B 39119e1ddfc0463338efd8996794a0df8b501ba3 B 394f961e56af0c939a85718afaf621e37550b5c8 +B 396025738e0e1e52a55458f54e768dd145638cf3 B 397702f9a8489dfc208449d4b10f627473652928 B 3988bd6672adb68b7196199a86fc01399240cb32 B 3998f7a7ef1a4d6662dff5ecde4016cbd7f90eda @@ -441,6 +442,7 @@ B 81afaf23837ffbeba9b5072ca97703b5a28db8c6 B 81e38d121ac0e0a570d0f64f6092de005bec939d B 81e9f147027c1eb344545544614e34478be28fb6 B 8254c29c201ab8431061c70068f758953c855e51 +B 827cf6bef453cdeae1433fb8c69956ee164388c2 B 837683b3d8e224426e91aed00a58bc338b12ca9b B 83a9b3fe77c8f216a21153824a837e3e3030c9a2 B 83ffeeb71c107d1f0377b27e2d0ac6cb0b009e3f @@ -1049,6 +1051,7 @@ M a6e0d8a6794a3747acc57603f4112aed713e2b4a M a7ed433e50e8c28fb12e6bf45505aaff78daac1c M a9d741aa35fd3a31941a987d1573d595cd26053c M aae58892bd42d2833860d8f6f8e836cd65897453 +M ab06aaec07034e736d4452e75543432c008bc727 M ab2f9d355885e50a3bc0094832aa35baccce489e M adb579226e2663538bb51e351b6a9473185f1684 M ae3663285e2df28bde63e37662caf70ddd41cb8d
