| commit | 0079367bc0590af43299929d525466d99d586a90 | [log] [tgz] |
|---|---|---|
| author | Paul Merlin <paulmerlin@apache.org> | Fri Jul 10 11:33:55 2015 +0200 |
| committer | Paul Merlin <paulmerlin@apache.org> | Fri Jul 10 11:33:55 2015 +0200 |
| tree | 1abbfda2531eea9bd37ce04640daf66e03355b6d | |
| parent | 141dc5c0188064cccf3356b66b2822a7bcc157c1 [diff] | |
| parent | 4076eae35756a67b472d3f7c17e60a0426662203 [diff] |
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/zest-qi4j into develop Conflicts: core/runtime/src/test/java/org/qi4j/regression/qi377/InterfaceCollisionWithRelatedReturnTypesTest.java