]> git.mxchange.org Git - pizzaservice.git/commit
projects / pizzaservice.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit9d6a62d78884f9920b4d5e83a1f4e58de1cd2d39
tree360aa741dec1f0b71498cb8a9107a9c6ddefe29dtree | snapshot
parent8d7ab9407aaa1aa90ee904fc0ffe876730cfa273commit | diff
parent63d57069c436f413835b90e53fa6b892802b5b06commit | diff
Merge branch 'master' of e:/Java Project/pizzaservice

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
Unnamed repository; edit this file 'description' to name the repository.