Merge remote-tracking branch 'remotes/parent/pr/222' 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/c7f5a699 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c7f5a699 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c7f5a699 Branch: refs/heads/master Commit: c7f5a699fb5a692876587f9c8cf1273a3ed48898 Parents: 175ec07 7178899 Author: Nikita Timofeev <stari...@gmail.com> Authored: Mon May 29 17:59:43 2017 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Mon May 29 17:59:43 2017 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java | 1 - .../org/apache/cayenne/modeler/action/DefaultActionManager.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) ----------------------------------------------------------------------
