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/6e3e2f26 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6e3e2f26 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6e3e2f26 Branch: refs/heads/2.6.x-fixes Commit: 6e3e2f2624de433440e4213c986e25a866e95a7f Parents: 4c25920 Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Feb 28 15:11:32 2014 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Feb 28 15:11:32 2014 +0000 ---------------------------------------------------------------------- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/6e3e2f26/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 44f6d22..71033de 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -782,6 +782,7 @@ B f1a819f5825436eb36976c73d02e5649f0052c3c B f1f5f9884b2090d09e8784225779ce02a41e3e7e B f245c6602c5d53f18addf6d6c378988eebacffd4 B f258080bdd54d6a23131af65389665317952713b +B f2984aa43bdad16684287956814687e608c66c7e B f2f0992022b4f92e92adba184404135fdac8c6b5 B f2f9b42a7a2c12465feaf1a0a9cab7e080373f40 B f3ea4b7f73ea3ff03aa99c8ce615bfc39e9c36f0 @@ -892,6 +893,7 @@ M 3297929347a65f25bd94a129b1ad17a1c944eda6 M 32d96f051dad120a70fd628f43753426eff6aa2f M 33471ad43675421745effe83cc43c9304d9117b8 M 33e0f164e0c2221ad03ac24f1e4963751846d890 +M 34e11ae3abe5c95c27cfdb2c089cc9d48936edf7 M 355c4d8b1ddad74fd209f31630e6e93e15168870 M 35a4abda4b235632b75b40879f71d8a1d27f4fcc M 379524376276a740503afdf96aa1fd8ce6b56d0f @@ -1039,6 +1041,7 @@ M a3b65acdf53a5f8606d22a679acf7adec9bce9e0 M a45fb9bedfcd7a127ffcc5f646b5b1899d6bc4e7 M a4bdec7eec5d11e8e8a53f9f9559c00305a2e70b M a5151a6178d788d05f7c1bbe8759626bb5cbe186 +M a583f5e78175cd662c1765aa48d3c28426b04dde M a601626ba8afa149b1d8c49ea10288f85fd65cda M a60482596fd1bd7f1f034e12913dfb66de6d4dda M a60efafbabdbb4b7ac35337f2c1729dc749671e0
