Merge remote-tracking branch 'origin/master' into TPCdev
authormkrzewic <mikolaj.krzewicki@cern.ch>
Thu, 6 Mar 2014 13:21:36 +0000 (14:21 +0100)
committermkrzewic <mikolaj.krzewicki@cern.ch>
Thu, 6 Mar 2014 13:21:36 +0000 (14:21 +0100)
commit30235f51e268837f42111dd7d2e434efcde9e00a
treeddd3cc5c4c4ada0bc5ff7449b4baf4c1e4c59e1e
parentc40cdd78643f73872c8ef2d8899b3ad72a896256
parent4aa5079b6b1acc989c478acbecba6d18163683d8
Merge remote-tracking branch 'origin/master' into TPCdev

Conflicts:
PWGPP/QA/Tracking/ExpertQA/AliHighPtTreeAnalysis.cxx
PWGPP/QA/Tracking/ExpertQA/AliHighPtTreeAnalysis.h
PWGPP/QA/Tracking/ExpertQA/makeTrendingPlots.C
PWGPP/macros/runFilteringTask.C
STEER/CDB/AliCDBLocal.cxx
STEER/ESD/AliESDtrack.cxx
PWGPP/QA/Tracking/ExpertQA/makeTrendingPlots.C
PWGPP/macros/runFilteringTask.C
STEER/CDB/AliCDBLocal.cxx
STEER/ESD/AliESDtrack.cxx
STEER/ESD/AliESDtrack.h
STEER/STEERBase/AliExternalTrackParam.cxx