Skip to content

Commit

Permalink
Merge branch 'vertx-webxr' of github.com-myrobotlab:MyRobotLab/myrobo…
Browse files Browse the repository at this point in the history 
…tlab into inmoov-and-statemachine-1
  • Loading branch information
@supertick
supertick committed Sep 10, 2023
2 parents 3cd480c + 24cfa91 commit 93ebb11
Show file tree
Hide file tree
Showing 13 changed files with 1,037 additions and 477 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,7 @@ build/
/lastRestart.py
/.factorypath
start.yml
config
src/main/resources/resource/InMoov2
src/main/resources/resource/ProgramAB
*.iml
1 change: 0 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ Enjoy the code review, address issues and concern in the code review
Reviewer merges pull request to develop.
Reviewer deletes branch.


The following config should be useful to work directly on WebGui UI and
InMoov2 UI if the repos are submoduled under
src/main/resources/resource/InMoov2,
Expand Down
Loading

0 comments on commit 93ebb11

Please sign in to comment.