Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 678ec5bfc -> 6601affb8
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/6601affb Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6601affb Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6601affb Branch: refs/heads/2.7.x-fixes Commit: 6601affb8baff730f211a268ea193bb7429775fa Parents: 9f4ee85 Author: Daniel Kulp <[email protected]> Authored: Wed Jul 30 14:32:08 2014 -0400 Committer: Daniel Kulp <[email protected]> Committed: Wed Jul 30 14:32:08 2014 -0400 ---------------------------------------------------------------------- .gitmergeinfo | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/6601affb/.gitmergeinfo ---------------------------------------------------------------------- diff --git a/.gitmergeinfo b/.gitmergeinfo index 823bfc2..72fb8c7 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -404,6 +404,7 @@ B 47a0908a8a90a00029e859a21feb9fd4b9512563 B 47d9548557c352b7ddf0468c322678b901d20ab9 B 48144f06a9779320b7d8537899b2f3b9ecacdb43 B 4843806921c665a3a2fecb5826ae2d20ec563ab2 +B 485bbc4a07137ec51faf22ecc32a22b2343d9317 B 48751778ed8eee0af48b4100b3e8260587e27754 B 4886e2590c6cd779d0bfca37424151a15d6bf633 B 4887c83e4ee7b15cbc2064f81d108b6d7bd9ae7d @@ -718,6 +719,7 @@ B 843e91a9d0972e50f5c1b164f908662183fd9ec3 B 8447da0da822db71c3b48f64eced15c7b4701b34 B 84645166440d3053558cd83ae2bec86c2c88ed8d B 849a7d883ff7c1415e7820ca6651ed0d80bf6a79 +B 84a8c8259017c52d2c3b2dee4a651e1856cf1e02 B 84c1a74ec6ad70ffe13e1477347f076632790858 B 84cb84b62c03d8afa82c79bbf62a72f5585ad08f B 84cbdf6ac5b7b242c77ea70937aae7ab1cb5e306 @@ -1506,6 +1508,7 @@ M 415fc29334310285b25d2c9a59c2640ee56a5963 M 417d9384948f93adcc0ce1c9f2786e8dcafa434d M 4199bf1c6cafedca459603cdc136c7d805226fc5 M 41d039fbd483609bac8837337c6c1b105c251459 +M 422c8814c715f99d5a663e29030e1f7e66b842c1 M 424c55b1edc445f7cb9f0c69e483f0f16238f07e M 43025ff2c4ceb0de499a31a4a9635cffe5db2eab M 434132594b23cc18f36cab5c3109a4490b35883c @@ -1696,6 +1699,7 @@ M 915a398a9e5e76f346dde29a4d4f4d94e8e03a7b M 9251e70e5d449caf0c014f41ec98d019f0bafd2a M 925978effd034bbddc7ebe3716c4f6ed916e5b40 M 925dffc63611a9e66846848850f4f8bcc29c2ffb +M 9279fd6475df20360115c66c12c56f8413fca051 M 92e17fb632f1b368e719b5d2066f823ce0ed1c5b M 92f88c0e6e2c7b0e0fc2c3d7cb80c40417ad9550 M 93cde374aafa21a984a4d76a192b6068d52fe6d1
