Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/e2b88661 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/e2b88661 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/e2b88661 Branch: refs/heads/develop Commit: e2b886613aeba8a5114a69dc3c0befad9781f5f6 Parents: 4971eb4 0ef97e9 Author: niclas <[email protected]> Authored: Thu Oct 26 15:34:22 2017 +0800 Committer: niclas <[email protected]> Committed: Thu Oct 26 15:34:22 2017 +0800 ---------------------------------------------------------------------- .../src/docs/what-is-composite-oriented-programming.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
