Merge branch 'findchirp_fixes'
authorTito Dal Canton <tito.canton@ligo.org>
Tue, 29 Jan 2013 11:13:17 +0000 (12:13 +0100)
committerTito Dal Canton <tito.canton@ligo.org>
Tue, 29 Jan 2013 11:13:17 +0000 (12:13 +0100)
commita8bd3dd6d727dc720523ae0381dfb389def4ee1b
tree7b3ca74d1fd88786079ae639d449c158eb227ca2
parent4b48daf4beb44911005b7f3c086dae0a124efc8f
parent5b1cc636ec210e7a852e5cc59dcade51d1b670d0
Merge branch 'findchirp_fixes'

Conflicts:
common/src/runtime/GWRuntime.cpp
common/include/runtime/GWRuntime.hpp
common/src/runtime/GWRuntime.cpp