From: ECal Group <hadaq@cbmpc026.gsi.de>
Date: Thu, 24 Sep 2015 12:02: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=f980e7e9e16430c44c9e1bd4f2ff61f649842d4b;p=daqtools.git

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

f980e7e9e16430c44c9e1bd4f2ff61f649842d4b
diff --cc thresholds/write_thresholds.pl
index 93a02c7,79cf32f..c2b567f
--- a/thresholds/write_thresholds.pl
+++ b/thresholds/write_thresholds.pl
@@@ -8,9 -8,9 +8,10 @@@ use Getopt::Long
  use HADES::TrbNet;
  use POSIX qw(strftime);
  
+ # use Time::HiRes qw(usleep nanosleep);
  my $offset = 0;
  my $help;
 +my $mode="padiwa";
  
  my $result = GetOptions (
      "h|help" => \$help,