From: Roland Haeder Date: Thu, 17 Sep 2015 14:10:49 +0000 (+0200) Subject: Merge branch 'master' of /media/quix0r/INTENSO/Java Project/pizzaservice-lib X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8319d5e8117d329371f224f12e68a0b536ee8da4;p=pizzaservice-lib.git Merge branch 'master' of /media/quix0r/INTENSO/Java Project/pizzaservice-lib Signed-off-by: Roland Häder --- 8319d5e8117d329371f224f12e68a0b536ee8da4 diff --cc lib/jcore.jar index 506736b,a56fe62..727898c Binary files differ diff --cc lib/jcoreee.jar index c0d5c4e,20252ca..78872fd Binary files differ diff --cc lib/jshop-core.jar index 1356683,ffdfed6..3b74f97 Binary files differ diff --cc lib/jshop-ee-lib.jar index 3bfc3a4,58fc16d..b5519e8 Binary files differ