polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject [05/24] zest-java git commit: Merge remote-tracking branch 'origin/develop' into develop
Date Wed, 26 Aug 2015 15:45:08 GMT
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	libraries/restlet/build.gradle


Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/8f889ea4
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/8f889ea4
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/8f889ea4

Branch: refs/heads/develop
Commit: 8f889ea4831969dcab4d03f6517b4a665738a700
Parents: 5989a71 1c1286a
Author: Niclas Hedhman <niclas@hedhman.org>
Authored: Sat Aug 22 17:14:50 2015 +0800
Committer: Niclas Hedhman <niclas@hedhman.org>
Committed: Sat Aug 22 17:14:50 2015 +0800

----------------------------------------------------------------------
 build.gradle                                    | 89 ++++++++++----------
 .../what-is-composite-oriented-programming.txt  | 13 ++-
 2 files changed, 56 insertions(+), 46 deletions(-)
----------------------------------------------------------------------



Mime
View raw message