Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

H

hidra
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

1b661e81

Commit 1b661e81 authored 8 years ago by Manuela Kuhn

Downloads
- Plain Diff

Merge branch 'liveViewerFixing'

parents 66b1f404 c1bab564

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

APIs/dataTransferAPI.py 40 additions, 36 deletions

APIs/dataTransferAPI.py
conf/dataManager.conf 1 addition, 1 deletion

conf/dataManager.conf
src/sender/DataManager.py 5 additions, 2 deletions

src/sender/DataManager.py
src/sender/SignalHandler.py 23 additions, 8 deletions

src/sender/SignalHandler.py
src/shared/helpers.py 12 additions, 1 deletion

src/shared/helpers.py
test/API/example_LiveViewer.py 13 additions, 10 deletions

test/API/example_LiveViewer.py

with 94 additions and 58 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