Merge remote-tracking branch 'origin/flatdev' into mergeFlat2Master
authormkrzewic <mikolaj.krzewicki@cern.ch>
Tue, 23 Sep 2014 12:50:46 +0000 (14:50 +0200)
committermkrzewic <mikolaj.krzewicki@cern.ch>
Tue, 23 Sep 2014 12:50:46 +0000 (14:50 +0200)
commite6fab200444b7a975ea881628b9dea1e5583851c
tree76dbe6eab4f547ceb95b32d3aa3a6935b885a4aa
parent8738a2f4ac32ea0f02794697425b07e42f451081
parenta48865c55743c063a46a0c714623efa5e79f7161
Merge remote-tracking branch 'origin/flatdev' into mergeFlat2Master

Conflicts:
STEER/AOD/AliAODMCParticle.h
STEER/CMakelibSTEERBase.pkg
STEER/ESD/AliESDEvent.h
STEER/STEERBase/AliMCEvent.cxx
STEER/STEERBase/AliMCEvent.h
STEER/STEERBase/AliVEvent.h
STEER/STEERBase/AliVParticle.h
STEER/STEERBase/AliVTrack.h
25 files changed:
ANALYSIS/AliAnalysisManager.cxx
HLT/ITS/AliHLTITSAgent.cxx
PWG/EMCAL/AliPicoTrack.h
PWG/FLOW/Tasks/AliFlowTrackCuts.h
PWGJE/EMCALJetTasks/AliEmcalJet.h
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/AliESDEvent.h
STEER/ESD/AliESDtrack.cxx
STEER/ESD/AliESDtrack.h
STEER/STEERBase/AliExternalTrackParam.h
STEER/STEERBase/AliMCEvent.cxx
STEER/STEERBase/AliMCEvent.h
STEER/STEERBase/AliTPCPIDResponse.cxx
STEER/STEERBase/AliVEvent.h
STEER/STEERBase/AliVParticle.h
STEER/STEERBase/AliVTrack.h
TPC/Calib/AliTPCcalibAlign.cxx
TPC/Calib/AliTPCcalibAlign.h
TPC/Calib/AliTPCcalibGainMult.cxx
TPC/TPCcalibLinkDef.h