Changeset 900ad95 in git for cards/CLIC

Timestamp:

Apr 20, 2018, 2:42:09 PM (7 years ago)

Author:

Ulrike Schnoor <ulrike.schnoor@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

7847cff, a89c86c

Parents:

96fd15f (diff), 8c3ac78 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote branch 'upstream/master'

(No files)