Fork me on GitHub

Changeset 624dc48 in git for doc

Timestamp:
Dec 9, 2014, 4:40:27 PM (10 years ago)
Author:
Pavel Demin <pavel.demin@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
17826f2, f355a2c
Parents:
2eb25b1 (diff), acf622f (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 'master' of github.com:delphes/delphes

Conflicts:

Makefile
modules/ModulesLinkDef.h

Location:
doc
Files:
2 added

Note: See TracChangeset for help on using the changeset viewer.