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/1705271c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1705271c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1705271c Branch: refs/heads/2.6.x-fixes Commit: 1705271ca56be4f0e7dffc97c848664e2d80158c Parents: 1f6dea5 Author: Daniel Kulp <dk...@apache.org> Authored: Mon Jun 30 13:29:20 2014 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Mon Jun 30 13:29:20 2014 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/1705271c/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index ee74f4f..f90ee47 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -48,6 +48,7 @@ B 094aab46fb968eaedbf25e72a009080c1f25d0b5 B 096c114091aa0a3f4c33c19d77ed54fd2b5495b8 B 09815dc32aaa55bd05eeb93d17b9afe9a396ed96 B 09c7b2f670b62b3a4e4d8a700a8b44494bbdd662 +B 0a0b9deec75db92a58ed6743b91efc4d3870fea7 B 0a9e2782d0f038e993b592f6f861d1ae9ecc3182 B 0aaa864df1e906d467cfd616fb61be44857d6ad2 B 0acc1a1ac6e61630c270e2be14241861e6621fce @@ -292,6 +293,7 @@ B 3fdfad74ec15fab793782136bfa7f976b0960ef9 B 4004fa9b03b2718b2653ee8da7e2e398f402f3d1 B 400b61573a54481058b4acd6c8f2ad27923e5801 B 400d82edb9682dc27f469c4e3b67ffdb78580c9e +B 4031f53706247231e2b70244932fe1b6f5042444 B 40414bc1caff4bfb058190705629a885b70a5356 B 40603ee2465db23283e4d6a5a976c27ac73063be B 4068dbda66afc2a8dc9f070971823db130abe575 @@ -1245,6 +1247,7 @@ M 32d96f051dad120a70fd628f43753426eff6aa2f M 33471ad43675421745effe83cc43c9304d9117b8 M 33e0f164e0c2221ad03ac24f1e4963751846d890 M 34e11ae3abe5c95c27cfdb2c089cc9d48936edf7 +M 353771670f917714c8370a5bf45c298649622c69 M 355c4d8b1ddad74fd209f31630e6e93e15168870 M 35a4abda4b235632b75b40879f71d8a1d27f4fcc M 364fba1ae623619c537ecaca1b9de8013b1c0d68
