Merge branch 'master' of https://git.cern.ch/reps/AliRoot

diff --cc MFT/CMakelibMFTbase.pkg
index bef1623471a9242bd1de3ae581cb37c5b2d1ae79,ed16f9cb6fe6f310c874f0e5e9eed301e231eaca..cb4482cadf5b558c0166bac0d4ec3d9ec8e8649c
--- 1/MFT/CMakelibMFTbase.pkg
--- 2/MFT/CMakelibMFTbase.pkg
+++ b/MFT/CMakelibMFTbase.pkg
@@@ -31,8 -31,10 +31,10 @@@ string ( REPLACE ".cxx" ".h" HDRS "${SR
  
  set ( DHDR MFTbaseLinkDef.h)
  
 -set ( EINCLUDE  STRUCT RAW MUON STEER/STEER STEER/STEERBase)
 +set ( EINCLUDE  STRUCT RAW MUON STEER/STEER STEER/AOD STEER/STEERBase)
  
+ set ( EXPORT AliMFTAnalysisTools.h AliMFTConstants.h)
+ 
  if( ALICE_TARGET STREQUAL "win32gcc")
        
                set ( PACKSOFLAGS  ${SOFLAGS} -L${ALICE_ROOT}/lib/tgt_${ALICE_TARGET} -lSTEER -lCDB -lSTEERBase )

diff --cc PWGJE/CMakelibPWGJE.pkg
Simple merge

diff --cc PWGJE/EMCALJetTasks/UserTasks/AliAnalysisTaskChargedJetsPA.cxx
Simple merge