Skip to content

Commit

Permalink
Merge branch '11315_TOPAZ_Live_Listener' of github.com:mantidproject/…
Browse files Browse the repository at this point in the history 
…mantid into 11315_TOPAZ_Live_Listener

Conflicts:
	Code/Mantid/Framework/LiveData/src/TOPAZLiveEventDataListener.cpp

Refs #11315
  • Loading branch information
@rgmiller
rgmiller committed Apr 15, 2015
2 parents c9ba701 + bae63c3 commit dec4dee
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit dec4dee

Please sign in to comment.