]> 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: bbddf50 c1cd4fc)
Merge branch 'flatdev' of https://git.cern.ch/reps/AliRoot into flatdev
authorsgorbuno <Sergey.Gorbunov@cern.ch>
Mon, 22 Sep 2014 19:13:42 +0000 (21:13 +0200)
committersgorbuno <Sergey.Gorbunov@cern.ch>
Mon, 22 Sep 2014 19:13:42 +0000 (21:13 +0200)
1  2 
HLT/global/AliFlatESDEvent.cxx patch | diff1 | diff2 | blob | history
HLT/global/AliFlatESDTrack.h patch | diff1 | diff2 | blob | history

diff --cc HLT/global/AliFlatESDEvent.cxx
Simple merge
diff --cc HLT/global/AliFlatESDTrack.h
Simple merge