]> git.mxchange.org Git - pizzaservice.git/commit
projects / pizzaservice.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8288d64 57630e4)
Merge branch 'rewrites/jpa' of e:/Java Project/pizzaservice
authorRoland Haeder <roland@mxchange.org>
Fri, 2 Oct 2015 06:57:42 +0000 (08:57 +0200)
committerRoland Haeder <roland@mxchange.org>
Fri, 2 Oct 2015 06:57:42 +0000 (08:57 +0200)
commit8d7ab9407aaa1aa90ee904fc0ffe876730cfa273
tree360aa741dec1f0b71498cb8a9107a9c6ddefe29dtree | snapshot
parent8288d645e1fce9b5553af6cb1ea49d57c6106494commit | diff
parent57630e49dbc52840e0994188b8901b049767d68fcommit | diff
Merge branch 'rewrites/jpa' of e:/Java Project/pizzaservice

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