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

a0d7187b

Commit a0d7187b authored 4 years ago by Tristan Walter

Downloads
- Plain Diff

Merge branch 'gl2'

parents 685edba1 5957df10

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Application/CMakeLists.txt 16 additions, 16 deletions

Application/CMakeLists.txt
Application/src/commons/common/gui/GLImpl.cpp 147 additions, 125 deletions

Application/src/commons/common/gui/GLImpl.cpp
Application/src/grabber/tgrabs.cpp 2 additions, 2 deletions

Application/src/grabber/tgrabs.cpp
Application/src/tracker/trex.cpp 2 additions, 2 deletions

Application/src/tracker/trex.cpp
conda/build.sh 2 additions, 0 deletions

conda/build.sh
conda/meta.yaml 21 additions, 18 deletions

conda/meta.yaml

with 190 additions and 163 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