Merge branch 'master' into TPCdev
authormivanov <marian.ivanov@cern.ch>
Sat, 5 Apr 2014 16:06:14 +0000 (18:06 +0200)
committermivanov <marian.ivanov@cern.ch>
Sat, 5 Apr 2014 16:06:14 +0000 (18:06 +0200)
commite503d80d4328c79fa771506fdcfafc529a95af20
treeb2bf37f1664afb4cf0ebd77768d90833d8f8aac9
parent3762ccbee1d0e0339d3854971cb9333c91f77505
parent161c57ac542716a3c0c103888929c9279fccdaf0
Merge branch 'master' into TPCdev

Conflicts:
ANALYSIS/macros/QAtrain_duo.C
ITS/UPGRADE/AliITSUGeomTGeo.cxx
OCDB/EMCAL/Calib/Data/Run0_999999999_v0_s0.root
PWG/FLOW/Base/AliFlowAnalysisWithMultiparticleCorrelations.cxx
PWG/FLOW/Tasks/AliAnalysisTaskMultiparticleCorrelations.h
PWG/FLOW/Tasks/AliJetFlowTools.cxx
PWG/FLOW/Tasks/AliJetFlowTools.h
PWGCF/Correlations/Base/AliCFParticle.h
PWGCF/Correlations/DPhi/AliAnalysisTaskLongRangeCorrelations.cxx
PWGCF/Correlations/DPhi/AliAnalysisTaskLongRangeCorrelations.h
PWGCF/Correlations/DPhi/AliLeadingV0Correlation.cxx
PWGCF/Correlations/macros/AddTaskLongRangeCorrelations.C
PWGDQ/dielectron/AliDielectronEvent.cxx
PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.cxx
PWGGA/CaloTrackCorrelations/AliAnaPi0EbE.h
PWGGA/GammaConv/macros/AddTask_GammaConvV1_PbPb.C
PWGHF/hfe/AliAnalysisTaskHFECal.cxx
PWGHF/hfe/AliAnalysisTaskHFECal.h
PWGHF/hfe/AliHFEtofPIDqa.cxx
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskChargedJetsPA.cxx
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHadEPpid.cxx
PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskEmcalJetHadEPpid.h
PWGJE/EMCALJetTasks/macros/AddTaskChargedJetsPA.C
PWGJE/EMCALJetTasks/macros/AddTaskEmcalJetHadEPpid.C
PWGJE/macros/AddTaskPWG4HighPtTrackQA.C
PWGLF/CMakelibPWGLFSTRANGENESS.pkg
PWGLF/PWGLFSTRANGENESSLinkDef.h
PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtAnalysisPbPbAOD.cxx
PWGLF/SPECTRA/ChargedHadrons/dNdPt/AlidNdPtAnalysisPbPbAOD.h
PWGLF/STRANGENESS/Correlations/AliAnalysisTaskLambdaOverK0sJets.cxx
PWGLF/STRANGENESS/Hypernuclei/AliAODMCNuclExReplicator.cxx
PWGPP/AliAnalysisTaskFilteredTree.cxx
PWGPP/benchmark/benchmark.sh
PWGUD/UPC/AliAnalysisTaskUpcTree.cxx
STEER/STEER/AliCTPRawData.cxx
STEER/STEER/AliReconstruction.cxx
TPC/Base/AliTPCROCVoltError3D.cxx
ZDC/AliZDC.cxx
ZDC/AliZDC.h
ZDC/AliZDCv4.cxx
STEER/ESD/AliESDtrack.h