From: Hades DAQ <hadaq@hades39.gsi.de>
Date: Mon, 29 May 2017 20:21:39 +0000 (+0200)
Subject: Merge branch 'master' of jspc28.x-matter.uni-frankfurt.de:daqtools
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=9dd6ae436908f3d86044af38fbf0d927d6c690f4;p=daqtools.git

Merge branch 'master' of jspc28.x-matter.uni-frankfurt.de:daqtools
---

9dd6ae436908f3d86044af38fbf0d927d6c690f4