cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From skolbac...@apache.org
Subject [4/4] cayenne git commit: Merge branch '153'
Date Wed, 14 Dec 2016 12:29:36 GMT
Merge branch '153'


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

Branch: refs/heads/master
Commit: 1f6100db28b3a04bb09e369eafca6d622ff3133b
Parents: 43b3080 bfdc415
Author: Savva Kolbachev <s.kolbachev@gmail.com>
Authored: Wed Dec 14 15:18:51 2016 +0300
Committer: Savva Kolbachev <s.kolbachev@gmail.com>
Committed: Wed Dec 14 15:18:51 2016 +0300

----------------------------------------------------------------------
 .../getting-started/src/docbkx/delete.xml       |  10 +-
 .../getting-started/src/docbkx/index.xml        |   4 +-
 .../getting-started/src/docbkx/java-classes.xml |  32 ++---
 .../src/docbkx/object-context.xml               |  39 +++---
 .../src/docbkx/object-relational-mapping.xml    |  69 +++++++----
 .../getting-started/src/docbkx/part1.xml        |   4 +-
 .../getting-started/src/docbkx/part2.xml        |   4 +-
 .../getting-started/src/docbkx/part3.xml        |   4 +-
 .../getting-started/src/docbkx/part4.xml        |   4 +-
 .../src/docbkx/persistent-objects.xml           |  37 +++---
 .../getting-started/src/docbkx/select-query.xml |  24 ++--
 .../getting-started/src/docbkx/setup.xml        |  28 ++---
 .../src/docbkx/starting-project.xml             |  98 ++++++++-------
 .../getting-started/src/docbkx/webapp.xml       | 119 ++++++++++---------
 .../getting-started/src/images/base-datamap.png | Bin 91074 -> 94872 bytes
 .../src/images/base-datanode.png                | Bin 81748 -> 96978 bytes
 .../src/images/chrome-webapp.png                | Bin 0 -> 42124 bytes
 .../src/images/eclipse-generatedclasses.png     | Bin 141000 -> 0 bytes
 .../src/images/eclipse-mvnrun.png               | Bin 147012 -> 0 bytes
 .../src/images/eclipse-xmlfiles.png             | Bin 27801 -> 0 bytes
 .../src/images/firefox-webapp.png               | Bin 25898 -> 0 bytes
 .../src/images/icon-attribute.gif               | Bin 0 -> 1171 bytes
 .../getting-started/src/images/icon-datamap.gif | Bin 0 -> 755 bytes
 .../src/images/icon-dbentity.gif                | Bin 0 -> 1171 bytes
 .../getting-started/src/images/icon-info.gif    | Bin 0 -> 755 bytes
 .../getting-started/src/images/icon-info.png    | Bin 0 -> 1098 bytes
 .../getting-started/src/images/icon-node.gif    | Bin 0 -> 331 bytes
 .../src/images/icon-objentity.gif               | Bin 0 -> 755 bytes
 .../src/images/icon-relationship.gif            | Bin 0 -> 1171 bytes
 .../src/images/icon-relationship.png            | Bin 0 -> 835 bytes
 .../getting-started/src/images/icon-sync.gif    | Bin 0 -> 331 bytes
 .../src/images/idea-configuration-menu.png      | Bin 0 -> 32911 bytes
 .../src/images/idea-generated-classes.png       | Bin 0 -> 198808 bytes
 .../src/images/idea-run-configuration.png       | Bin 0 -> 93059 bytes
 .../src/images/idea-xmlfiles.png                | Bin 0 -> 27783 bytes
 .../src/images/maven-plugin-install.png         | Bin 97455 -> 0 bytes
 .../src/images/modeler-artistid.png             | Bin 59372 -> 65879 bytes
 .../src/images/modeler-dbrelationship.png       | Bin 42245 -> 41730 bytes
 .../src/images/modeler-deleterule.png           | Bin 69992 -> 83349 bytes
 .../src/images/modeler-started.png              | Bin 133410 -> 98815 bytes
 .../src/images/tutorial-eclipse-project.png     | Bin 70937 -> 0 bytes
 .../src/images/tutorial-idea-project.png        | Bin 0 -> 48037 bytes
 42 files changed, 249 insertions(+), 227 deletions(-)
----------------------------------------------------------------------



Mime
View raw message