Merge remote-tracking branch 'remotes/parent/pr/215' 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/d0f685dc Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/d0f685dc Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/d0f685dc Branch: refs/heads/master Commit: d0f685dc6d6c14453620eb9bfd9ea4754a6d75de Parents: 947ddc6 981d5d1 Author: Nikita Timofeev <stari...@gmail.com> Authored: Fri May 19 16:16:14 2017 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Fri May 19 16:16:14 2017 +0300 ---------------------------------------------------------------------- .../cayenne/modeler/ProjectFileChangeTracker.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
