https://github.com/biochem-fan/cheetah
Revision ebf7e2a3a1bf1a5eccd84821132b59e8ab6bfe5b authored by Anton Barty on 15 June 2013, 19:53:07 UTC, committed by Anton Barty on 15 June 2013, 19:53:07 UTC
Conflicts:
	scripts/hitfinder
	source/cheetah.xcodeproj/project.pbxproj
	source/cheetah.xcodeproj/project.xcworkspace/xcuserdata/barty.xcuserdatad/UserInterfaceState.xcuserstate
	source/libcheetah/CMakeLists.txt
	source/libcheetah/src/detectorObject.cpp
	source/libcheetah/src/libcheetah.cpp
	source/libcheetah/src/setup.cpp
	source/libcheetah/src/worker.cpp
2 parent s 975b02e + d9842b0
History
Tip revision: ebf7e2a3a1bf1a5eccd84821132b59e8ab6bfe5b authored by Anton Barty on 15 June 2013, 19:53:07 UTC
Merge branch 'testing' into L711
Tip revision: ebf7e2a

back to top