Skip to content

Commit

Permalink
Merge pull request #45 from ipa-fxm/APACHE_license
Browse files Browse the repository at this point in the history
use license apache 2.0
  • Loading branch information
fmessmer committed Aug 8, 2017
2 parents ae9109f + dc9ecab commit 135403a
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cob_docker_control/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<version>0.6.5</version>
<description>Autonomous docking</description>

<license>private</license>
<license>Apache 2.0</license>

<maintainer email="florian.weisshardt@ipa.fraunhofer.de">Florian Weisshardt</maintainer>
<author email="florian.weisshardt@ipa.fraunhofer.de">Florian Weisshardt</author>
Expand Down
18 changes: 17 additions & 1 deletion cob_docker_control/scripts/fake_docking.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,18 @@
#!/usr/bin/python
#!/usr/bin/env python
#
# Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.


print "this is just a placeholder"
18 changes: 17 additions & 1 deletion cob_docker_control/scripts/multi_station_docker_control.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,18 @@
#!/usr/bin/python
#!/usr/bin/env python
#
# Copyright 2017 Fraunhofer Institute for Manufacturing Engineering and Automation (IPA)
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.


print "this is just a placeholder"
2 changes: 1 addition & 1 deletion cob_reflector_referencing/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
It can be used to position/reference a robot wrt to the reflektor markers.
</description>

<license>private</license>
<license>Apache 2.0</license>

<maintainer email="florian.weisshardt@ipa.fraunhofer.de">Florian Weisshardt</maintainer>
<author email="florian.weisshardt@ipa.fraunhofer.de">Florian Weisshardt</author>
Expand Down
4 changes: 2 additions & 2 deletions cob_safety_controller/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<version>0.6.5</version>
<description>This package is a substitute for the private implementation of cob_safety_controller package</description>

<maintainer email="mdl@ipa.fhg.de">Matthias Luedtke</maintainer>
<maintainer email="florian.weisshardt@ipa.fraunhofer.de">Florian Weisshardt</maintainer>

<license>LGPL</license>
<license>Apache 2.0</license>

<buildtool_depend>catkin</buildtool_depend>

Expand Down
2 changes: 1 addition & 1 deletion cob_substitute/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<version>0.6.5</version>
<description>cob_substitute</description>

<license>LGPL</license>
<license>Apache 2.0</license>

<url type="website">http://ros.org/wiki/cob_substitute</url>
<!-- <url type="bugtracker"></url> -->
Expand Down

0 comments on commit 135403a

Please sign in to comment.