]> git.mxchange.org Git - pizzaservice.git/commit
projects / pizzaservice.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 595afd1 684bcaa)
Merge branch 'rewrites/jpa' of e:/Java Project/pizzaservice into rewrites/jpa
authorRoland Haeder <roland@mxchange.org>
Wed, 30 Sep 2015 06:15:02 +0000 (08:15 +0200)
committerRoland Haeder <roland@mxchange.org>
Wed, 30 Sep 2015 06:15:02 +0000 (08:15 +0200)
commitc49019cfb4a4babff0f82d8a7359dff3bae8a0c2
tree49bfb6c7f959972d7086807f3ff9091e25592f16tree | snapshot
parent595afd1788645b8eaac20253c85ff3fb31bc5fdbcommit | diff
parent684bcaa3c20a3047d0144b74b5c2342e87253a48commit | diff
Merge branch 'rewrites/jpa' of e:/Java Project/pizzaservice into rewrites/jpa

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
PizzaService-ejb/lib/jcore.jar
PizzaService-ejb/nbproject/private/private.properties diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.