From: HADES DAQ <hadaq@kp1pc105.gsi.de>
Date: Wed, 17 Sep 2014 16:50:55 +0000 (+0200)
Subject: Merge branch 'master' of jspc29.x-matter.uni-frankfurt.de:daqtools
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=91862775cb0d6572da2d1d17f0e9fcc62ff3cb6b;p=daqtools.git

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

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

91862775cb0d6572da2d1d17f0e9fcc62ff3cb6b
diff --cc web/htdocs/tools/pwr/pwr.conf
index ea8b731,92d4063..61e7917
--- a/web/htdocs/tools/pwr/pwr.conf
+++ b/web/htdocs/tools/pwr/pwr.conf
@@@ -7,4 -9,4 +7,5 @@@ Content-type: text/htm
  
  PWRSPLY:/dev/ttyUSB0:9600:PST3202:PST:3
  //PWRSPLY:/dev/ttyUSB0:115200:HMP4030:HMP:3
- //PWRSPLY:/dev/ttyUSB1:2400:PSP405:PSP:1
+ //PWRSPLY:/dev/ttyUSB1:2400:PSP405:PSP:1
++