Changeset 37deb3b in git for modules/IdentificationMap.cc

Timestamp:

Dec 9, 2014, 1:40:26 PM (10 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

9e991f8

Parents:

49234af (diff), ba7fc1e (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 branch 'Delphes4LHCb' of ​https://github.com/selvaggi/delphes into selvaggi-Delphes4LHCb

Conflicts:

Makefile

File:

• modules/IdentificationMap.cc (added)