* added link to jarp.sh to fit previous file structure
* Contributors: Marc Hanheide
pnp
* Merge pull request #1 <https://github.com/marc-hanheide/PetriNetPlans/issues/1> from marc-hanheide/master
bringing it back in line with master branch
*
* merged upstream (resolved conflicts)
* added Luca Iocchi as author in all packages
* sanitised some package.xml and CMakeLists.txt
* Merge branch 'master' of https://github.com/iocchi/PetriNetPlans into upstream-merge
Conflicts:
PNP/src/CMakeLists.txt
* added global PNP installation
* Contributors: Luca Iocchi, Marc Hanheide
pnp_msgs
* Merge pull request #1 <https://github.com/marc-hanheide/PetriNetPlans/issues/1> from marc-hanheide/master
bringing it back in line with master branch
*
* merged upstream (resolved conflicts)
* added Luca Iocchi as author in all packages
* sanitised some package.xml and CMakeLists.txt
* Merge branch 'master' of https://github.com/iocchi/PetriNetPlans into upstream-merge
Conflicts:
PNP/src/CMakeLists.txt
* Contributors: Marc Hanheide
pnp_ros
* Merge pull request #1 <https://github.com/marc-hanheide/PetriNetPlans/issues/1> from marc-hanheide/master
bringing it back in line with master branch
*
* merged upstream (resolved conflicts)
* added Luca Iocchi as author in all packages
* sanitised some package.xml and CMakeLists.txt
* Merge branch 'master' of https://github.com/iocchi/PetriNetPlans into upstream-merge
Conflicts:
PNP/src/CMakeLists.txt
* Contributors: Marc Hanheide
pnpgen
* Merge pull request #1 <https://github.com/marc-hanheide/PetriNetPlans/issues/1> from marc-hanheide/master
bringing it back in line with master branch
*
* merged upstream (resolved conflicts)
* added Luca Iocchi as author in all packages
* sanitised some package.xml and CMakeLists.txt
* Merge branch 'master' of https://github.com/iocchi/PetriNetPlans into upstream-merge
Conflicts:
PNP/src/CMakeLists.txt
* Generation of PNP from conditional plans
* Contributors: Luca Iocchi, Marc Hanheide
rp_action
* Merge pull request #1 <https://github.com/marc-hanheide/PetriNetPlans/issues/1> from marc-hanheide/master
bringing it back in line with master branch
*
* merged upstream (resolved conflicts)
* added Luca Iocchi as author in all packages
* sanitised some package.xml and CMakeLists.txt
* Merge branch 'master' of https://github.com/iocchi/PetriNetPlans into upstream-merge
Conflicts:
PNP/src/CMakeLists.txt
* Contributors: Marc Hanheide
rp_action_msgs
* Merge pull request #1 <https://github.com/marc-hanheide/PetriNetPlans/issues/1> from marc-hanheide/master
bringing it back in line with master branch
*
* merged upstream (resolved conflicts)
* added Luca Iocchi as author in all packages
* sanitised some package.xml and CMakeLists.txt
* Merge branch 'master' of https://github.com/iocchi/PetriNetPlans into upstream-merge
Conflicts:
PNP/src/CMakeLists.txt
* Contributors: Marc Hanheide
tug_example_actions
* Merge pull request #1 <https://github.com/marc-hanheide/PetriNetPlans/issues/1> from marc-hanheide/master
bringing it back in line with master branch
*
* merged upstream (resolved conflicts)
* added Luca Iocchi as author in all packages
* sanitised some package.xml and CMakeLists.txt
* Merge branch 'master' of https://github.com/iocchi/PetriNetPlans into upstream-merge
Conflicts:
PNP/src/CMakeLists.txt
* Contributors: Marc Hanheide
tug_example_msgs
* Merge pull request #1 <https://github.com/marc-hanheide/PetriNetPlans/issues/1> from marc-hanheide/master
bringing it back in line with master branch
*
* merged upstream (resolved conflicts)
* added Luca Iocchi as author in all packages
* sanitised some package.xml and CMakeLists.txt
* Merge branch 'master' of https://github.com/iocchi/PetriNetPlans into upstream-merge
Conflicts:
PNP/src/CMakeLists.txt
* Contributors: Marc Hanheide
tug_example_pnp_server
* Merge pull request #1 <https://github.com/marc-hanheide/PetriNetPlans/issues/1> from marc-hanheide/master
bringing it back in line with master branch
*
* merged upstream (resolved conflicts)
* added Luca Iocchi as author in all packages
* sanitised some package.xml and CMakeLists.txt
* Merge branch 'master' of https://github.com/iocchi/PetriNetPlans into upstream-merge
Conflicts:
PNP/src/CMakeLists.txt
* Contributors: Marc Hanheide
Increasing version of package(s) in repository
pnp_ros
to0.0.9-0
:indigo/distribution.yaml
0.5.20
0.0.8-0
jarp
pnp
pnp_msgs
pnp_ros
pnpgen
rp_action
rp_action_msgs
tug_example_actions
tug_example_msgs
tug_example_pnp_server