You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2016/12/19 12:11:27 UTC
[2/2] cayenne git commit: Merge branch '161'
Merge branch '161'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/437bc348
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/437bc348
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/437bc348
Branch: refs/heads/master
Commit: 437bc348e98a9d68d3bfb4f733451032ff1fab69
Parents: 62652ff 7b67748
Author: Savva Kolbachev <s....@gmail.com>
Authored: Mon Dec 19 15:11:10 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Mon Dec 19 15:11:10 2016 +0300
----------------------------------------------------------------------
.../getting-started/src/docbkx/java-classes.xml | 2 +-
.../getting-started/src/docbkx/object-context.xml | 15 ++++++++++++---
.../src/docbkx/object-relational-mapping.xml | 14 +++++++-------
.../src/docbkx/starting-project.xml | 4 ++--
docs/docbook/getting-started/src/docbkx/webapp.xml | 15 +++++----------
.../src/images/idea-configuration-menu.png | Bin 32911 -> 0 bytes
.../src/images/idea-edit-configurations.png | Bin 0 -> 17245 bytes
.../src/images/idea-file-run-menu.png | Bin 0 -> 32911 bytes
8 files changed, 27 insertions(+), 23 deletions(-)
----------------------------------------------------------------------