Fork me on GitHub

Ignore:
Timestamp:
Jun 21, 2016, 4:37:17 PM (8 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
52315d4
Parents:
04290b1 (diff), 659c7b6 (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 dev_01

File:
1 edited

Legend:

Unmodified
Added
Removed

  • external/PUPPI/PuppiContainer.hh

    r04290b1 rf688c89  
    11#include "PuppiAlgo.hh"
    22#include "RecoObj2.hh"
    3 //#include "external/fastjet/internal/base.hh"
    4 #include "external/fastjet/PseudoJet.hh"
     3#include "fastjet/PseudoJet.hh"
    54#include <vector>
    65
Note: See TracChangeset for help on using the changeset viewer.