Merge remote-tracking branch 'origin/master' into hydro-dev (b1495ac8) · Commits · bigprint / universal_robot · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

U

universal_robot
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

bigprint
universal_robot
Commits
b1495ac8

Commit b1495ac8 authored 11 years ago by

IPR-SR2

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into hydro-dev

parents 708b506b f550c9f7

Branches

Tags

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

README.md 14 additions, 0 deletions

README.md
ur5_moveit_config/config/controllers.yaml 2 additions, 3 deletions

ur5_moveit_config/config/controllers.yaml
ur5_moveit_config/launch/ur5_moveit_controller_manager.launch 1 addition, 10 deletions

...moveit_config/launch/ur5_moveit_controller_manager.launch
ur5_moveit_config/package.xml 1 addition, 1 deletion

ur5_moveit_config/package.xml
ur_driver/src/ur_driver/deserialize.py 27 additions, 2 deletions

ur_driver/src/ur_driver/deserialize.py
ur_driver/test_move.py 1 addition, 1 deletion

ur_driver/test_move.py

with 46 additions and 17 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment