]> git.mxchange.org Git - pizzaservice.git/commitdiff
projects / pizzaservice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8d7ab94 63d5706)
Merge branch 'master' of e:/Java Project/pizzaservice
authorRoland Haeder <roland@mxchange.org>
Fri, 2 Oct 2015 07:00:02 +0000 (09:00 +0200)
committerRoland Haeder <roland@mxchange.org>
Fri, 2 Oct 2015 07:00:02 +0000 (09:00 +0200)
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
PizzaService-ejb/nbproject/build-impl.xml
PizzaService-ejb/nbproject/genfiles.properties
PizzaService-ejb/nbproject/project.xml


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