Repository: cxf Updated Branches: refs/heads/2.7.x-fixes dc23aafaa -> 454497ab9
Add a mapping for where some of the jaxrs stuff was moved Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/91f47fce Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/91f47fce Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/91f47fce Branch: refs/heads/2.7.x-fixes Commit: 91f47fce8131e774850a44a69dfd3ca05b80f4cd Parents: dc23aaf Author: Daniel Kulp <[email protected]> Authored: Fri Apr 4 09:48:04 2014 -0400 Committer: Daniel Kulp <[email protected]> Committed: Fri Apr 4 09:48:04 2014 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/91f47fce/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 81f3715..22d4b1a 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -1,6 +1,7 @@ origin/master A core api A core rt/core +A rt/rs/description rt/frontend/jaxrs B 0011b05059467fcd6fbeeb859907d69a9d25efe2 B 003518b1d29250c59493d1b1965303aac8505475 B 003a0d420dca03b94d5ec111dab645669446a942
