Heath Thomann 2269ea2fab OPENJPA-1911: fix merge problem for entities with derived id - merged this code from Fay's changes for trunk ... git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@1069924 13f79535-47bb-0310-9956-ffa450edef68		2011-02-11 19:23:29 +00:00
..
src	OPENJPA-1911: fix merge problem for entities with derived id - merged this code from Fay's changes for trunk	2011-02-11 19:23:29 +00:00
pom.xml	[maven-release-plugin] prepare for next development iteration	2010-08-26 01:42:33 +00:00