]> git.mxchange.org Git - pizzaservice-swing.git/commit
Merge branch 'rewrites/jpa' of e:/Java Project/pizzaservice-swing
authorRoland Haeder <roland@mxchange.org>
Fri, 2 Oct 2015 07:01:39 +0000 (09:01 +0200)
committerRoland Haeder <roland@mxchange.org>
Fri, 2 Oct 2015 07:01:39 +0000 (09:01 +0200)
commit9eabf33bf25d702f6be27a0af85ec7fe20fbb57c
tree2227a6c1f509bff52ca44889c3f036a8e5a9c98f
parentc6f68f396a4d9338d9e2d31e47d8f0f51a29d08a
parent9d814c3d2ad7b545198075791ea199355804d844
Merge branch 'rewrites/jpa' of e:/Java Project/pizzaservice-swing

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