]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
git://git.uio.no / u / mrichter / AliRoot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5aded0 9a92457)
Merge branch 'master' into TPCdev
authormivanov <marian.ivanov@cern.ch>
Sun, 12 Oct 2014 09:32:33 +0000 (11:32 +0200)
committermivanov <marian.ivanov@cern.ch>
Sun, 12 Oct 2014 09:32:33 +0000 (11:32 +0200)
1  2 
STEER/CDB/AliCDBManager.h patch | diff1 | diff2 | blob | history
STEER/ESD/AliESDtrack.cxx patch | diff1 | diff2 | blob | history
STEER/STEER/AliSimulation.cxx patch | diff1 | diff2 | blob | history
TPC/Base/AliTPCcalibDB.cxx patch | diff1 | diff2 | blob | history

diff --cc STEER/CDB/AliCDBManager.h
Simple merge
diff --cc STEER/ESD/AliESDtrack.cxx
Simple merge
diff --cc STEER/STEER/AliSimulation.cxx
Simple merge
diff --cc TPC/Base/AliTPCcalibDB.cxx
Simple merge