Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

mantid
- Activity
- Members
- Labels
- Wiki
- Releases
- Model registry

Snippets Groups Projects

ffd1aea2

Commit ffd1aea2 authored 10 years ago by Russell Taylor

Downloads
- Plain Diff

Merge remote branch 'origin/feature/9563_beam_monitor_packets'

parents 994c9c66 b1bedd24

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

Code/Mantid/Framework/LiveData/inc/MantidLiveData/ADARA/ADARAPackets.h 28 additions, 24 deletions

...ramework/LiveData/inc/MantidLiveData/ADARA/ADARAPackets.h
Code/Mantid/Framework/LiveData/src/ADARA/ADARAPackets.cpp 62 additions, 16 deletions

Code/Mantid/Framework/LiveData/src/ADARA/ADARAPackets.cpp
Code/Mantid/Framework/LiveData/src/SNSLiveEventDataListener.cpp 19 additions, 9 deletions

...antid/Framework/LiveData/src/SNSLiveEventDataListener.cpp

with 109 additions and 49 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