]> jspc29.x-matter.uni-frankfurt.de Git - daqtools.git/commit
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:daqtools
authorHADES DAQ <hadaq@kp1pc105.gsi.de>
Wed, 17 Sep 2014 16:50:55 +0000 (18:50 +0200)
committerHADES DAQ <hadaq@kp1pc105.gsi.de>
Wed, 17 Sep 2014 16:50:55 +0000 (18:50 +0200)
commit91862775cb0d6572da2d1d17f0e9fcc62ff3cb6b
tree5123cbd653619379483dffdba30b86634289b653
parent6d42325bf4a73881a7937a3d4860e089c06d080e
parent19db2b167acfa4578c994d9e5a17749fe00dc82e
Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:daqtools

Conflicts:
base/serials_trb3.db
web/htdocs/tools/pwr/pwr.conf
web/htdocs/tools/pwr/pwr.conf