Skip to content
Snippets Groups Projects
Commit 1626d785 authored by Shio Sakon's avatar Shio Sakon
Browse files

Merge remote-tracking branch 'origin/master' into tom_mass_model

merge "update control.in" into the tom_mass_model branch.
control.in is in gstlal-calibration/debian/control.in
parents 3c4b9f6c 3880762a
No related branches found
No related tags found
No related merge requests found
......@@ -54,7 +54,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends},
libgstreamer1.0-dev (>= @MIN_GSTREAMER_VERSION@),
libgstreamer-plugins-base1.0-dev (>= @MIN_GSTREAMER_VERSION@),
python3-all-dev (>= @MIN_PYTHON_VERSION@),
gsl-dev
libgsl-dev
Conflicts:
gstlal-ugly (<< 0.6.0),
gstlal-calibration (<< 1.3.0)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment