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/5408d137 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5408d137 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5408d137 Branch: refs/heads/2.6.x-fixes Commit: 5408d1379837b5d165584efb4da607a67f0995d6 Parents: 0507c72 Author: Colm O hEigeartaigh <[email protected]> Authored: Mon May 26 17:20:01 2014 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon May 26 17:20:01 2014 +0100 ---------------------------------------------------------------------- .gitmergeinfo | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/5408d137/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 25c2fb1..53b4f59 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -339,6 +339,7 @@ B 4ab70ced8a037666e9c6de658b9575d332dd192b B 4ac67cb41963b23d8874f1d7b883bb945f11943c B 4ae6bbc9304fb1dd17b0abd0ebfc8fb4ac259561 B 4b6f222592f16fc86006557ec0e045a8af1d953b +B 4b8bbe90e5a7629709b027da711e0a82b87e9f70 B 4ba78268ef7a6424bec9a8733fb4fd886b833271 B 4bf1ec021bdae5d3df9acf3e7241750569e060e4 B 4ddb76c33e9f46f042645edbeac95a016aa415f0 @@ -1121,6 +1122,7 @@ M 0e1cca949e90ad28845c55ff622433e0942b593b M 0e59703e878acf5d2163cd850bdbba3e64c489fb M 0f7c5d0939376d809aebb7ef3bd94ff91f6b4d6f M 0f908cd6ce9c69f841caacea7e82180acd7d92ab +M 0fe383ed2eca3d0be73e234bafbd1671a2c9704d M 10e02ff29cc007e130b81b0b48d9fb12240563bd M 10eddb64b4bc05243f261d697ff67fbead4992f4 M 11138e928324cf722916435bc0ffbcef9e930614 @@ -1211,6 +1213,7 @@ M 47b127dbdb4a10d282be92f2ebbe646f8cf6b03e M 48a2bf8a924dd7b91500aad9b1e54958ef99a3e2 M 498eb375538e1398693f23b0b3d5d2e26a68d05a M 4993d47c8ee12dc9eb21cf91908edbb65a405cb2 +M 49a9e00d2674e9879e2bebcc084a11ec0a5c7e41 M 4a2f5a551eba64783711c213d66b38a95c0bec62 M 4aa02fc4d72b851c33f8408490654a70f09cb3e7 M 4ab8c4b00360e2bfa530fb6048fef856a3e296e3
