]> git.uio.no Git - u/mrichter/AliRoot.git/commit - DIME/test.C
Merge remote-tracking branch 'origin/master' into mergingFlat
authormkrzewic <mikolaj.krzewicki@cern.ch>
Wed, 5 Nov 2014 09:25:59 +0000 (10:25 +0100)
committermkrzewic <mikolaj.krzewicki@cern.ch>
Wed, 5 Nov 2014 09:25:59 +0000 (10:25 +0100)
commite72663d5ea704f30a9a1df4852c98d2cb07d29d7
tree317c30a8ec53109adad95fada3377afb6f18ec79
parent3b9d5d9eb2b9484e2d8e978ed4e5dff8239ade37
parent4188a021ac4b30f00c30f850e7079c5434f1b5ee
Merge remote-tracking branch 'origin/master' into mergingFlat

accepted master versions of the jet stuff
conflict in AOD was trivial

Conflicts:
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.cxx
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskPtEMCalTrigger.h
STEER/AOD/AliAODTrack.cxx
STEER/AOD/AliAODEvent.cxx
STEER/AOD/AliAODEvent.h
STEER/AOD/AliAODTrack.cxx
STEER/AOD/AliAODTrack.h
STEER/CMakelibSTEERBase.pkg
STEER/ESD/AliESDEvent.cxx
STEER/ESD/AliESDtrack.cxx
STEER/ESD/AliESDtrack.h
STEER/STEERBase/AliExternalTrackParam.h
STEER/STEERBase/AliVVertex.h
STEER/STEERBaseLinkDef.h