From: Michael Traxler Date: Wed, 30 Jan 2019 14:48:30 +0000 (+0100) 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=3630bf161ad7d21a71d88f520f21520306e6ba0e;p=daqtools.git Merge branch 'master' of jspc28.x-matter.uni-frankfurt.de:daqtools --- 3630bf161ad7d21a71d88f520f21520306e6ba0e diff --cc base/serials_dirich.db index 66ee740,14317a9..857e520 --- a/base/serials_dirich.db +++ b/base/serials_dirich.db @@@ -940,10 -940,7 +941,14 @@@ 9231 0x7100000a49e0e728 # dirich3 untested 9241 0xdd00000a494eb928 # dirich3 untested MACHXo3 not programmed -> JTAG prob. 9251 0x8900000a48dfb128 # dirich3 untested ++<<<<<<< HEAD +9261 0xd500000a49406b28 # dirich3 untested +9281 0x0300000a525aa428 # dirich3 untested +10301 0x4100000a4917a128 # dirich3 untested +10311 0xaa00000a4917a428 # dirich3 untested ++======= + 10301 0x4100000a4917a128 #test ++>>>>>>> b0291c6ff6b9e056ca23dd0424169c7525c7cbe7 10331 0x0600000a49897828 # dirich3 untested 10341 0x6100000a49bc4c28 # dirich3 untested 10361 0xf700000a49bc4528 # dirich3 untested