From: Cahit Ugur <c.ugur@gsi.de>
Date: Wed, 28 Aug 2013 09:54:34 +0000 (+0200)
Subject: Merge branch 'master' of git://jspc29.x-matter.uni-frankfurt.de/projects/daqtools
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=f30ec605b837acf0e38af07e71796c2569b77f8b;p=daqtools.git

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

Conflicts:
	web/htdocs/tools/pwr/pwr.conf
---

f30ec605b837acf0e38af07e71796c2569b77f8b
diff --cc web/htdocs/tools/pwr/pwr.conf
index 316ba45,0e8e681..6ae274b
--- a/web/htdocs/tools/pwr/pwr.conf
+++ b/web/htdocs/tools/pwr/pwr.conf
@@@ -1,3 -1,3 +1,6 @@@
  //PWRSPLY:/path/to/device:speed:Name:Type:Channels
  //type can be HMP, PSP, PST
- PWRSPLY:/dev/ttyUSB0:9600:PST3202:PST:3
++
++// PWRSPLY:/dev/ttyUSB0:9600:PST3202:PST:3
+ PWRSPLY:/dev/ttyUSB0:115200:HMP4030:HMP:3
++