]> 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: ad83768 41bd964)
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authoralla <Alla.Maevskaya@cern.ch>
Sun, 11 Jan 2015 21:05:01 +0000 (22:05 +0100)
committeralla <Alla.Maevskaya@cern.ch>
Sun, 11 Jan 2015 21:05:01 +0000 (22:05 +0100)
Conflicts:
T0/AliT0RawReader.cxx


Trivial merge