Merge remote-tracking branch 'remotes/origin/master' into TPCdev
authormivanov <marian.ivanov@cern.ch>
Wed, 23 Apr 2014 14:46:49 +0000 (16:46 +0200)
committermivanov <marian.ivanov@cern.ch>
Wed, 23 Apr 2014 14:46:49 +0000 (16:46 +0200)
Conflicts:
STEER/ESD/AliESDtrack.cxx

1  2 
STEER/ESD/AliESDtrack.cxx
STEER/STEERBase/AliExternalTrackParam.cxx
STEER/STEERBase/AliExternalTrackParam.h

Simple merge