You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ko...@apache.org on 2015/04/24 00:12:49 UTC

[04/17] cayenne git commit: Merge remote-tracking branch 'upstream/master'

Merge remote-tracking branch 'upstream/master'


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

Branch: refs/heads/master
Commit: a71e2aeff164e9fcecc99668483fe33f04a2210b
Parents: 1454f65 f65d762
Author: alexkolonitsky <Al...@gmail.com>
Authored: Fri Aug 29 10:34:30 2014 +0300
Committer: alexkolonitsky <Al...@gmail.com>
Committed: Fri Aug 29 10:34:30 2014 +0300

----------------------------------------------------------------------
 .../org/apache/cayenne/gen/DataMapArtifact.java |  4 +
 .../cayenne/tools/CayenneGeneratorTask.java     | 18 +++++
 docs/doc/src/main/resources/RELEASE-NOTES.txt   |  1 +
 .../cayenne/modeler/ProjectTreeModel.java       | 64 ++++++---------
 .../modeler/dialog/datadomain/FilterDialog.java | 84 +++++++-------------
 .../cayenne/modeler/editor/EditorView.java      | 68 ++++++++--------
 rat.sh                                          |  1 +
 7 files changed, 116 insertions(+), 124 deletions(-)
----------------------------------------------------------------------