]> 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: 21b3120 6d49461)
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authorfbock <friederike.bock@cern.ch>
Sat, 29 Nov 2014 14:05:47 +0000 (15:05 +0100)
committerfbock <friederike.bock@cern.ch>
Sat, 29 Nov 2014 14:05:47 +0000 (15:05 +0100)

Trivial merge