Skip to content

Commit

Permalink
"updated conan dependencies, Jenkins badge in readme; updates #255"
Browse files Browse the repository at this point in the history
  • Loading branch information
martukas committed Mar 18, 2022
1 parent de095fc commit e600923
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# DAQuiri
Versatile DAQ engine for physics detectors, event mode and otherwise, with a variety of histogram types for images, spectra, time-of-flight, activity.

[![Build Status](https://jenkins.esss.dk/dm/job/ess-dmsc/job/daquiri/job/master/badge/icon)](https://jenkins.esss.dk/dm/job/ess-dmsc/job/daquiri/job/master/)
[![DOI](https://zenodo.org/badge/94489375.svg)](https://zenodo.org/badge/latestdoi/94489375)

![screenshot](documentation/screenshot.png)
Expand Down
4 changes: 2 additions & 2 deletions conanfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ h5cpp/0.4.0-dm2@ess-dmsc/stable
nlohmann_json/3.9.1
librdkafka/1.6.0
logical-geometry/705ea61@ess-dmsc/stable
qplot/2ffc74f@ess-dmsc/stable
Qt-Color-Widgets/a95f72e@ess-dmsc/stable
qplot/3f6c5ad@ess-dmsc/testing
Qt-Color-Widgets/9f4e052@ess-dmsc/testing
spdlog/1.8.5
streaming-data-types/6a41aee@ess-dmsc/stable
fmt/5.3.0@bincrafters/stable
Expand Down

0 comments on commit e600923

Please sign in to comment.