Merge branch 'master' of jspc26:daqtools

diff --cc users/frankfurt_test/register_configgbe.db
index 2132b75e920ddf5ca1dbd2ffb5db09cc9443ebe8,b0e62678bf575deaff50a0493551e726d1b4d61b..5b8dcd91c65641dd8a9ad7d5111886a60ba8d713
--- 1/users/frankfurt_test/register_configgbe.db
--- 2/users/frankfurt_test/register_configgbe.db
+++ b/users/frankfurt_test/register_configgbe.db
@@@ -17,9 -17,10 +17,10 @@@
    0x8200      0       0x8200        1            0        0xffffff         1
    0x8820      0       0x8200        1            0        0xffffff         1
    0xf3ce      0       0x82ce        1            1        0xffffff         1
 -  0xc000      0       0x8000        1            1        0xffffff         1
 +  0xc000      0       0xc000        1            1        0xffffff         1
    0xc002      0       0xc002        1            0        0xffffff         1
    0xc148      0       0xc148        1            0        0xffffff         1
+   0x83cc      0       0x83cc        1            0        0xffffff         1
  
    
  

diff --cc users/frankfurt_test/register_configgbe_ip.db
index fa520121f71277543f439b27bfa1507b24a933c4,d2756bca3bc6d361aad61465e7d8ea4a17f8ab46..21567bc57e8b1f4d0f7ab186cda0d34d9a2e7113
--- 1/users/frankfurt_test/register_configgbe_ip.db
--- 2/users/frankfurt_test/register_configgbe_ip.db
+++ b/users/frankfurt_test/register_configgbe_ip.db
@@@ -33,8 -33,10 +33,9 @@@
   0x8200        0    0x546C5E8B     0x0008      0xc0a800fe      0xc353     0xc350
   0x8820        0    0x546C5E8B     0x0008      0xc0a800fe      0xc354     0xc350
   0xf3ce        0    0x546C5E8B     0x0008      0xc0a800fe      0xc354     0xc350
 - 0xc000        0    0x546C5E8B     0x0008      0xc0a800fe      0xc351     0xc350
 + 0xc000        0    0xf4c85d53     0xbc5f      0xc0a80067      0xc351     0xc350
   0xc002        0    0x546C5E8B     0x0008      0xc0a800fe      0xc362     0xc350
   0xc148        0    0x546C5E8B     0x0008      0xc0a800fe      50148      0xc350
+  0x83cc        0    0x546C5E8B     0x0008      0xc0a800fe      50030      0xc350
  
  
 -

diff --cc users/frankfurt_test/startup.sh
Simple merge