]> jspc29.x-matter.uni-frankfurt.de Git - daqtools.git/commit
Merge branch 'master' of git://jspc29.x-matter.uni-frankfurt.de/projects/daqtools
authorCahit Ugur <c.ugur@gsi.de>
Wed, 28 Aug 2013 09:54:34 +0000 (11:54 +0200)
committerCahit Ugur <c.ugur@gsi.de>
Wed, 28 Aug 2013 09:54:34 +0000 (11:54 +0200)
commitf30ec605b837acf0e38af07e71796c2569b77f8b
treebb3391f16244dc44d38d81ba976a58d25428997e
parentd10c07f26f07f2552e6818ccfd804ed2d1c0b629
parentbe50aa8b93163813cd8f0d1256283a7b9bb54cae
Merge branch 'master' of git://jspc29.x-matter.uni-frankfurt.de/projects/daqtools

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