Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

56e48b7b

Commit 56e48b7b authored 5 years ago by Mirko Wächter

Downloads
- Patches
- Plain Diff

fixed merge problems in logviewer

parent aea416a9

No related branches found

No related tags found

1 merge request!62Ice Deployment in Scenario Manager and improved LogViewe

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

source/ArmarXGui/gui-plugins/LoggingPlugin/ArmarXLogViewer/LogTable.cpp 9 additions, 4 deletions

...ui/gui-plugins/LoggingPlugin/ArmarXLogViewer/LogTable.cpp
source/ArmarXGui/gui-plugins/LoggingPlugin/ArmarXLogViewer/LogViewer.cpp 6 additions, 1 deletion

...i/gui-plugins/LoggingPlugin/ArmarXLogViewer/LogViewer.cpp

with 15 additions and 5 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