Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

ArmarXGui
- Activity
- Members
- Labels
- Container Registry
- Model registry

Snippets Groups Projects

d635f35d

Commit d635f35d authored 8 years ago by Mirko Wächter

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into CompileOptimization

parents 1e56ad2d d22a567e

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

etc/cmake/ArmarXPackageVersion.cmake 1 addition, 1 deletion

etc/cmake/ArmarXPackageVersion.cmake
source/ArmarXGui/applications/ArmarXGui/ArmarXGuiApp.cpp 3 additions, 0 deletions

source/ArmarXGui/applications/ArmarXGui/ArmarXGuiApp.cpp
source/ArmarXGui/libraries/StructuralJson/JPathNavigator.cpp 15 additions, 0 deletions

source/ArmarXGui/libraries/StructuralJson/JPathNavigator.cpp
source/ArmarXGui/libraries/StructuralJson/JPathNavigator.h 2 additions, 0 deletions

source/ArmarXGui/libraries/StructuralJson/JPathNavigator.h
source/ArmarXGui/libraries/StructuralJson/SimpleLexer.cpp 1 addition, 1 deletion

source/ArmarXGui/libraries/StructuralJson/SimpleLexer.cpp

with 22 additions and 2 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