Changeset e7e90df in git for external

Timestamp:

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

Author:

Michele <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

49234af

Parents:

01f457a (diff), f6b6ee7 (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' into TestFastJet310b1

Conflicts:

Makefile
examples/Example1.C
examples/Example2.C
examples/Example3.C

Location:

external/ProMC

Files:

• ProMC.pb.cc (deleted)
• ProMC.pb.h (deleted)
• ProMCBook.cc (deleted)
• ProMCBook.h (deleted)
• ProMCDescription.pb.cc (deleted)
• ProMCDescription.pb.h (deleted)
• ProMCHeader.pb.cc (deleted)
• ProMCHeader.pb.h (deleted)
• ProMCStat.pb.cc (deleted)
• ProMCStat.pb.h (deleted)