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/23 22:21:30 UTC

git commit: Add merge tracking to 3.0.x-fixes

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes e6efdf543 -> 99ce97ea9


Add merge tracking to 3.0.x-fixes


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/99ce97ea
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/99ce97ea
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/99ce97ea

Branch: refs/heads/3.0.x-fixes
Commit: 99ce97ea9c976d5e57cc79b4b26d9b10a3bb4eaa
Parents: e6efdf5
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Jul 23 16:19:36 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Wed Jul 23 16:19:36 2014 -0400

----------------------------------------------------------------------
 .gitmergeinfo | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/99ce97ea/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
new file mode 100644
index 0000000..152010a
--- /dev/null
+++ b/.gitmergeinfo
@@ -0,0 +1,2 @@
+origin/master
+