]> 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: 76e6e4c 1e1ffc3)
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authormorsch <andreas.morsch@cern.ch>
Thu, 5 Jun 2014 13:39:20 +0000 (15:39 +0200)
committermorsch <andreas.morsch@cern.ch>
Thu, 5 Jun 2014 13:39:20 +0000 (15:39 +0200)

Trivial merge