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/11/11 18:36:03 UTC

[3/3] cayenne git commit: Merge branch '120'

Merge branch '120'


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/9df92ec2
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/9df92ec2
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/9df92ec2

Branch: refs/heads/master
Commit: 9df92ec27efdf5fbb9317f6643dfe04259aa7bbf
Parents: 1e25df7 8e8348a
Author: Savva Kolbachev <s....@gmail.com>
Authored: Fri Nov 11 21:35:40 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Fri Nov 11 21:35:40 2016 +0300

----------------------------------------------------------------------
 .../apache/cayenne/modeler/action/DefaultActionManager.java | 5 +++--
 .../apache/cayenne/modeler/action/ImportDataMapAction.java  | 8 ++++++--
 .../apache/cayenne/modeler/dialog/DbImportProjectSaver.java | 9 +++++++--
 .../apache/cayenne/modeler/dialog/db/DbLoaderHelper.java    | 3 ++-
 4 files changed, 18 insertions(+), 7 deletions(-)
----------------------------------------------------------------------