]> git.uio.no Git - u/mrichter/AliRoot.git/commit
git://git.uio.no / u / mrichter / AliRoot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 59221a6 087d566)
Merge branch 'master' of https://git.cern.ch/reps/AliRoot
authormorsch <andreas.morsch@cern.ch>
Sat, 25 Oct 2014 18:25:17 +0000 (20:25 +0200)
committermorsch <andreas.morsch@cern.ch>
Sat, 25 Oct 2014 18:25:17 +0000 (20:25 +0200)
commit5657cf196677274b82f2fafb0d86c4958bd0f43d
tree55c79bff69269668ce336baea44866c73f1936f6tree | snapshot (tar.bz2 zip)
parent59221a67b3ec6b640bf25f768592b7d828ecf68fcommit | diff
parent087d56661929ecd8e9322af27e829fbeac18d213commit | diff
Merge branch 'master' of https://git.cern.ch/reps/AliRoot

Conflicts:
LHAPDF/CMakeliblhapdf5_9_1.pkg
LHAPDF/CMakeliblhapdf5_9_1.pkg diff1 | diff2 | blob | history