Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

trex
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

d8ca2500

Commit d8ca2500 authored 4 years ago by Tristan Walter

Downloads
- Plain Diff

Merge branch 'master' into gl2

parents d00bfbf7 3e3f4935

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

.github/workflows/cmake.yml 1 addition, 1 deletion

.github/workflows/cmake.yml
Application/src/commons/common/gui/types/Drawable.cpp 1 addition, 0 deletions

Application/src/commons/common/gui/types/Drawable.cpp
Application/src/grabber/pvinfo.cpp 2 additions, 0 deletions

Application/src/grabber/pvinfo.cpp
Application/src/tracker/gui/Timeline.cpp 1 addition, 1 deletion

Application/src/tracker/gui/Timeline.cpp
Application/src/tracker/misc/default_config.cpp 5 additions, 2 deletions

Application/src/tracker/misc/default_config.cpp
conda/meta.yaml 2 additions, 2 deletions

conda/meta.yaml
docs/batch.rst 16 additions, 0 deletions

docs/batch.rst
docs/contents.rst 2 additions, 0 deletions

docs/contents.rst
docs/gui.rst 39 additions, 0 deletions

docs/gui.rst
docs/parameters_trex.rst 1 addition, 1 deletion

docs/parameters_trex.rst
docs/run.rst 54 additions, 65 deletions

docs/run.rst
images/trex_display_options.png 0 additions, 0 deletions

images/trex_display_options.png
images/trex_screenshot_web.png 0 additions, 0 deletions

images/trex_screenshot_web.png

with 124 additions and 72 deletions

Loading

0% Loading 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