]> git.mxchange.org Git - pizzaservice-swing.git/commitdiff
projects / pizzaservice-swing.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6f68f3 9d814c3)
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)
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
lib/jcore-swing.jar
lib/jcore.jar
lib/jshop-core.jar


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.