]> git.uio.no Git - u/mrichter/AliRoot.git/commit - PWGUD/UPC/AliAnalysisTaskUpcPsi2s.cxx
Merge branch 'workdir'
authorJulian Book <Julian>
Wed, 18 Dec 2013 10:05:09 +0000 (11:05 +0100)
committerJulian Book <jbook@cern.ch>
Wed, 18 Dec 2013 10:05:09 +0000 (11:05 +0100)
commited7ba2e50d1b649c07c2e206fe80577f7eb1523e
treeb265634bab1c2bba09f0c72dae6705ca69815f04
parentf691ae771ee89a6a5cd3bd133899752ff849247d
parent30f9a3931c6fa07c7136e5e14e04e8be60a820f5
Merge branch 'workdir'

Conflicts:
PWGDQ/dielectron/AliDielectron.cxx
PWGDQ/dielectron/AliDielectron.h
PWGDQ/dielectron/AliDielectronVarManager.h