]> git.mxchange.org Git - pizzaservice-lib.git/commit
Merge branch 'rewrites/jpa' of e:/Java Project/pizzaservice-lib
authorRoland Haeder <roland@mxchange.org>
Fri, 2 Oct 2015 07:00:51 +0000 (09:00 +0200)
committerRoland Haeder <roland@mxchange.org>
Fri, 2 Oct 2015 07:00:51 +0000 (09:00 +0200)
commit7f02927b4cddce9cfcf6bd49b8b0532c82d93f06
treee6cade88ea27f9a604877686698aff9f08e6c68d
parent4382937fc2bfc3223f6652a8979460a4ed86bef5
parentb3cda14dc9997218183b77efec5c7e7db5f5688b
Merge branch 'rewrites/jpa' of e:/Java Project/pizzaservice-lib

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
lib/jcore.jar
lib/jshop-core.jar