]> 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: 899d014 e0d98c3)
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorfbock <Friederike.Bock@cern.ch>
Thu, 13 Feb 2014 14:44:24 +0000 (15:44 +0100)
committerfbock <Friederike.Bock@cern.ch>
Thu, 13 Feb 2014 14:44:24 +0000 (15:44 +0100)

Trivial merge