Merge remote-tracking branch 'remotes/parent/pr/221' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/32fd7357 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/32fd7357 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/32fd7357 Branch: refs/heads/master Commit: 32fd73575c4c1c0597bdfd128799e05694f5aa72 Parents: c299812 b7f1724 Author: Nikita Timofeev <stari...@gmail.com> Authored: Mon May 29 15:31:23 2017 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Mon May 29 15:31:23 2017 +0300 ---------------------------------------------------------------------- .../dialog/WarningDialogByDbTargetChange.java | 86 ++++++++++++++++++++ .../dbentity/DbRelationshipTableModel.java | 12 +-- .../cayenne/modeler/util/ProjectUtil.java | 46 +++++++++++ 3 files changed, 139 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
