]> 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: 667496a 13d6113)
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authormorsch <andreas.morsch@cern.ch>
Mon, 27 Oct 2014 21:04:28 +0000 (22:04 +0100)
committermorsch <andreas.morsch@cern.ch>
Mon, 27 Oct 2014 21:04:28 +0000 (22:04 +0100)

Trivial merge