Merge branch 'master' into TPCdev
authormivanov <marian.ivanov@cern.ch>
Sun, 23 Nov 2014 00:23:18 +0000 (01:23 +0100)
committermivanov <marian.ivanov@cern.ch>
Sun, 23 Nov 2014 00:23:18 +0000 (01:23 +0100)
commit675be5d197979d856acfeec070b3abbb30b24943
tree58f1eb9dfcef7bd78763e9242651080f03340d6f
parentc687d49a98a03b68b28474105b41f8df28d86d21
parent909e332a6bb76ed38615640a89638c27fb07f022
Merge branch 'master' into TPCdev

Conflicts:
TPC/Base/AliTPCCalROC.cxx