From: Roland Haeder <roland@mxchange.org>
Date: Fri, 2 Oct 2015 07:01:39 +0000 (+0200)
Subject: Merge branch 'rewrites/jpa' of e:/Java Project/pizzaservice-swing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9eabf33bf25d702f6be27a0af85ec7fe20fbb57c;p=pizzaservice-swing.git

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
---

9eabf33bf25d702f6be27a0af85ec7fe20fbb57c