sravan/RRRobot
1
0
Fork 0
mirror of https://github.com/EECS-467-W20-RRRobot-Project/RRRobot.git synced 2025-08-29 10:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'reorg' into GEAR

Browse Source 
- Fix issues when workspaces were moved to root src folder
This commit is contained in:
Sravan Balaji
2020-04-20 18:31:10 -04:00
parent 07d5564ab2 f6c202548d
commit dc0914abaa
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@@ -1,9 +1,9 @@
# Don't track the content of these folders # # Don't track the content of these folders #
############################################ ############################################
src/rrrobot_ws/lib/ src/*/lib/
src/rrrobot_ws/build src/*/build
src/rrrobot_ws/devel src/*/devel
src/rrrobot_ws/install src/*/install
.* .*
!.gitignore !.gitignore

2
.gitmodules vendored
View File

@@ -1,4 +1,4 @@
[submodule "ariac_ws/src/universal_robot"] [submodule "src/ariac_ws/src/universal_robot"]
path = src/ariac_ws/src/universal_robot path = src/ariac_ws/src/universal_robot
url = https://github.com/osrf/universal_robot url = https://github.com/osrf/universal_robot
branch = ariac_2019_ur10_moveit_config branch = ariac_2019_ur10_moveit_config

1
src/ariac_ws/src/universal_robot Submodule

Submodule src/ariac_ws/src/universal_robot added at 8bb711dc9f