]> git.mxchange.org Git - jshop-lib.git/commitdiff
erge branch 'rewrites/jpa' of e:/Java Project/jshop-ee-lib
authorRoland Haeder <roland@mxchange.org>
Fri, 2 Oct 2015 06:53:00 +0000 (08:53 +0200)
committerRoland Haeder <roland@mxchange.org>
Fri, 2 Oct 2015 06:53:00 +0000 (08:53 +0200)
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
lib/jcore.jar
lib/jshop-core.jar


Trivial merge