Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/44a28722 Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/44a28722 Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/44a28722 Branch: refs/heads/develop Commit: 44a287228cfc6ae256685b1cd890d6f326ca43ce Parents: 0c5845a 2088779 Author: Niclas Hedhman <[email protected]> Authored: Fri Jul 10 16:42:34 2015 +0300 Committer: Niclas Hedhman <[email protected]> Committed: Fri Jul 10 16:42:34 2015 +0300 ---------------------------------------------------------------------- ...faceCollisionWithRelatedReturnTypesTest.java | 2 -- ...alueCollisionWithRelatedReturnTypesTest.java | 36 +++++++++++++------- libraries.gradle | 4 +++ libraries/rest-common/build.gradle | 18 +++------- libraries/rest/build.gradle | 2 -- samples/dci-cargo/dcisample_a/build.gradle | 27 +++++++-------- samples/dci-cargo/dcisample_b/build.gradle | 27 +++++++-------- tutorials/composites/build.gradle | 2 -- 8 files changed, 58 insertions(+), 60 deletions(-) ----------------------------------------------------------------------
