Skip to content

Commit

Permalink
Merge pull request #141 from Kapim/devel
Browse files Browse the repository at this point in the history
Devel
  • Loading branch information
Kapim authored Jun 19, 2020
2 parents 778c842 + ff2302b commit b0c53c4
Show file tree
Hide file tree
Showing 82 changed files with 60,639 additions and 58,609 deletions.
5 changes: 4 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
ignore = dirty
[submodule "arcor2_AREditor/Submodules/Unity3DRuntimeTransformGizmo"]
path = arcor2_AREditor/Submodules/Unity3DRuntimeTransformGizmo
url = https://github.com/HiddenMonk/Unity3DRuntimeTransformGizmo.git
url = https://github.com/xBambusekD/Unity3DRuntimeTransformGizmo.git
ignore = dirty
[submodule "arcor2_AREditor/Submodules/usfb"]
path = arcor2_AREditor/Submodules/usfb
Expand All @@ -25,3 +25,6 @@
[submodule "arcor2_AREditor/Submodules/Simple-Side-Menu"]
path = arcor2_AREditor/Submodules/Simple-Side-Menu
url = https://github.com/Kapim/Simple-Side-Menu.git
[submodule "arcor2_AREditor/Submodules/NativeWebSocket"]
path = arcor2_AREditor/Submodules/NativeWebSocket
url = https://github.com/endel/NativeWebSocket.git
Loading

0 comments on commit b0c53c4

Please sign in to comment.