]> git.mxchange.org Git - pizzaservice.git/commitdiff
projects / pizzaservice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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

1  2 
PizzaService-ejb/nbproject/build-impl.xml patch | diff1 | diff2 | blob | history

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