[SCM] root-system: CERN's ROOT Data Analysis Framework branch, master, updated. upstream/5.34.00-50-g3b30c12

[Lifeng Sun]

The following commit has been merged in the master branch:
commit a8f3091d03d01a9e33ccd474421de3aa6c0aa1d6
Merge: 8c03a1a63c0641aac3d7920566aa25c1ce7a1e54 cb3b7e2c73a228fdb270ec18b6b9861c847d27a7
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sat Jul 14 20:49:16 2012 +0800

    Merge tag 'upstream/5.34.01'
    
    Upstream version 5.34.01
    
    Conflicts:
    	build/version_number
    	core/base/inc/RVersion.h
    	etc/svninfo.txt
    	hist/hist/src/TH1.cxx
    	hist/hist/src/TH2.cxx
    	hist/hist/src/TH3.cxx
    	io/io/src/TFileMerger.cxx
    	proof/proofd/src/XrdProofdClient.cxx
    	proof/proofd/src/XrdProofdClientMgr.cxx
    	proof/proofd/src/XrdProofdProofServ.cxx
    	proof/proofd/src/XrdProofdProofServMgr.cxx
    	proof/proofd/src/XrdProofdProtocol.cxx
    	roofit/histfactory/src/Channel.cxx
    	roofit/histfactory/src/ConfigParser.cxx
    	roofit/histfactory/src/Measurement.cxx
    	roofit/roofit/src/RooBernstein.cxx
    	roofit/roofitcore/inc/RooCacheManager.h
    	roofit/roofitcore/inc/RooMinimizerFcn.h
    	roofit/roofitcore/src/RooAbsData.cxx
    	roofit/roofitcore/src/RooAbsPdf.cxx
    	roofit/roofitcore/src/RooBanner.cxx
    	roofit/roofitcore/src/RooEffGenContext.cxx
    	roofit/roofitcore/src/RooFitResult.cxx
    	roofit/roofitcore/src/RooGlobalFunc.cxx
    	roofit/roofitcore/src/RooHistFunc.cxx
    	roofit/roofitcore/src/RooMinimizerFcn.cxx
    	roofit/roofitcore/src/RooPlot.cxx
    	roofit/roostats/inc/RooStats/ModelConfig.h
    	roofit/roostats/inc/RooStats/NeymanConstruction.h
    	roofit/roostats/inc/RooStats/SimpleLikelihoodRatioTestStat.h
    	roofit/roostats/src/AsymptoticCalculator.cxx
    	roofit/roostats/src/HLFactory.cxx
    	roofit/roostats/src/HybridCalculator.cxx
    	roofit/roostats/src/ModelConfig.cxx
    	roofit/roostats/src/RooStatsUtils.cxx
    	roofit/roostats/src/ToyMCSampler.cxx
    	test/stressRooStats.cxx
    	test/stressRooStats_models.cxx
    	test/stressRooStats_tests.cxx
    	tree/tree/src/TTree.cxx


-- 
root-system: CERN's ROOT Data Analysis Framework