]> 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: 90acf41 aba8920)
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorfbock <Friederike.Bock@cern.ch>
Fri, 19 Dec 2014 10:02:16 +0000 (11:02 +0100)
committerfbock <Friederike.Bock@cern.ch>
Fri, 19 Dec 2014 10:02:16 +0000 (11:02 +0100)

Trivial merge