git.uio.no Git - u/mrichter/AliRoot.git/commit

]> git.uio.no Git - u/mrichter/AliRoot.git/commit

git://git.uio.no / u / mrichter / AliRoot.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 16fcd61) | patch

author	marian <marian@f7af4fe6-9843-0410-8265-dc069ae4e863>
	Wed, 18 Apr 2012 12:35:54 +0000 (12:35 +0000)
committer	marian <marian@f7af4fe6-9843-0410-8265-dc069ae4e863>
	Wed, 18 Apr 2012 12:35:54 +0000 (12:35 +0000)
commit	4d2581eba9999c93410038a966a8bc41f9232bee
tree	bbaf138d9ac695aa133a841a2198257308404986	tree \| snapshot (tar.bz2 zip)
parent	16fcd6181dc4f2e241b0f386a2c782c8f5d7256a	commit \| diff

Fix neccessary for local merge
(Mikolaj)

PWGPP/CalibMacros/CPass0/merge.C		diff \| blob \| blame \| history
PWGPP/CalibMacros/CPass1/merge.C		diff \| blob \| blame \| history