Merge branch 'TPCdev' of https://git.cern.ch/reps/AliRoot into TPCdev
authormivanov <marian.ivanov@cern.ch>
Wed, 15 Oct 2014 13:04:45 +0000 (15:04 +0200)
committermivanov <marian.ivanov@cern.ch>
Wed, 15 Oct 2014 13:04:45 +0000 (15:04 +0200)
commit8a94851da43f9ac5722436279ec43a4934291511
tree357e8dbe99fe16f42dcc7ad994e318a4df8f698c
parent41bfb738e182ee79735053d30b76024725d57379
parentd1f493e4c13b190e243a3fcbcc0a67f3e64382f7
Merge branch 'TPCdev' of https://git.cern.ch/reps/AliRoot into TPCdev

Conflicts:
PWGPP/CalibMacros/CPass0/makeOCDB.C
PWGPP/CalibMacros/CPass1/makeOCDB.C
TPC/Base/AliTPCSpaceCharge3D.cxx
TPC/Base/AliTPCSpaceCharge3D.h
cmake/CMakelinuxx8664gcc.cmake
test/testdEdx/sim.C
test/testdEdx/submitSimJobs.sh