You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/07/01 20:22:15 UTC
[3/3] git commit: Recording .gitmergeinfo Changes
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/4347218d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4347218d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4347218d
Branch: refs/heads/2.6.x-fixes
Commit: 4347218d37056784095a255cd05d3d41389a74d3
Parents: 6c30be6
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Jul 1 14:22:05 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Jul 1 14:22:05 2014 -0400
----------------------------------------------------------------------
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/4347218d/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index f90ee47..4157e73 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -187,6 +187,7 @@ B 2a25cd21f1c339c3f5e546986104e5dc2261f60b
B 2a548e8c23ac00d2698e93aa1b7435439b329b0e
B 2a743ebbd824eb4c84fe7dc747851097628bd472
B 2a8f8f5ba4e57c6c487d59b7121689c60d7fa091
+B 2b74eea72a3c163edc9614cd7db7c83c5884a4d0
B 2be20f00d61bdab039af20ae2e8fec66774f8425
B 2be3af700bcd3b956297dfe925546faccb60ef0b
B 2c1b1627a412eadd72d51e2058a34a7a4a86f8e4
@@ -1438,6 +1439,7 @@ M a5f5fadd29ddb3fea6d0e6f1e0e55b2a448d7e7e
M a601626ba8afa149b1d8c49ea10288f85fd65cda
M a60482596fd1bd7f1f034e12913dfb66de6d4dda
M a60efafbabdbb4b7ac35337f2c1729dc749671e0
+M a6d699868f6d66f2795852a38662acff2870d20e
M a6e0d8a6794a3747acc57603f4112aed713e2b4a
M a7ed433e50e8c28fb12e6bf45505aaff78daac1c
M a95114e138410835fe8c8c7d979a5a945425f3fd