[root-system] 07/21: Merge tag 'upstream/5.34.14'
Lifeng Sun
lifengsun-guest at moszumanska.debian.org
Sat Aug 2 08:35:04 UTC 2014
This is an automated email from the git hooks/post-receive script.
lifengsun-guest pushed a commit to branch master
in repository root-system.
commit 1686cee8f009352ff951c5b886938e8c0b67e5b9
Merge: a3cc2eb fc3c59b
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Tue Dec 17 12:02:24 2013 +0800
Merge tag 'upstream/5.34.14'
Upstream version 5.34.14
.gitignore | 9 +-
CMakeLists.txt | 2 +-
Makefile | 20 +-
README/CREDITS | 15 +
bindings/pyroot/src/Converters.cxx | 12 +-
build/unix/installDavix.sh | 381 ++
build/version_number | 2 +-
cint/cint/src/common.h | 6 +-
cint/reflex/CMakeLists.txt | 2 +-
cint/reflex/python/genreflex/gendict.py | 2 +-
cint/reflex/python/genreflex/genreflex.py | 5 +-
cmake/modules/FindAlien.cmake | 4 +-
cmake/modules/FindMySQL.cmake | 31 +-
cmake/modules/FindOpenGL.cmake | 159 -
cmake/modules/FindPythia6.cmake | 40 +-
cmake/modules/RootBuildOptions.cmake | 16 +
cmake/modules/RootConfiguration.cmake | 43 +-
cmake/modules/RootInstallDirs.cmake | 126 +-
cmake/modules/RootNewMacros.cmake | 2 +-
cmake/modules/SearchInstalledSoftware.cmake | 37 +-
cmake/modules/SetUpLinux.cmake | 12 +-
cmake/modules/SetUpWindows.cmake | 4 +-
cmake/scripts/ROOTConfig.cmake.in | 61 +-
config/Makefile.depend | 8 +
config/Makefile.in | 8 +-
config/Makefile.ios | 4 +-
config/Makefile.iossim | 4 +-
config/rootrc.in | 89 +-
configure | 64 +
core/base/inc/RVersion.h | 10 +-
core/lzma/CMakeLists.txt | 2 +-
core/metautils/inc/ESTLType.h | 3 +-
core/zip/CMakeLists.txt | 2 +-
doc/v534/index.html | 2 +-
etc/gitinfo.txt | 6 +-
etc/plugins/TFile/P100_TXNetFile.C | 11 +-
etc/plugins/TFile/P130_TDavixFile.C | 19 +
etc/plugins/TFileStager/P010_TXNetFileStager.C | 9 +-
etc/plugins/TSystem/P040_TXNetSystem.C | 9 +-
etc/plugins/TSystem/P045_TDavixSystem.C | 19 +
graf2d/asimage/BuildAfterImage.cmake | 9 +-
graf2d/graf/src/TLatex.cxx | 22 +
graf2d/ios/src/IOSFillPatterns.cxx | 104 +-
graf2d/postscript/src/TSVG.cxx | 257 +-
graf2d/postscript/src/TTeXDump.cxx | 2 +-
graf3d/gl/CMakeLists.txt | 20 +-
gui/ged/inc/LinkDef.h | 1 +
gui/ged/inc/TTextEditor.h | 63 +
gui/ged/src/TTextEditor.cxx | 163 +
hist/hist/inc/HFitInterface.h | 10 +
hist/hist/inc/TGraph.h | 2 +-
hist/hist/inc/TH1.h | 3 +-
hist/hist/inc/TProfile.h | 1 +
hist/hist/inc/TProfile2D.h | 1 +
hist/hist/inc/TProfile3D.h | 1 +
hist/hist/src/HFitImpl.cxx | 59 +-
hist/hist/src/HFitInterface.cxx | 12 +-
hist/hist/src/TAxis.cxx | 2 +
hist/hist/src/TGraph.cxx | 93 +-
hist/hist/src/TH1.cxx | 42 +-
hist/hist/src/TH2.cxx | 13 +-
hist/hist/src/THStack.cxx | 17 +-
hist/hist/src/TProfile.cxx | 22 +-
hist/hist/src/TProfile2D.cxx | 14 +-
hist/hist/src/TProfile3D.cxx | 16 +-
hist/hist/src/TProfileHelper.h | 16 +
io/io/src/TFile.cxx | 3 +-
math/mathcore/src/Factory.cxx | 13 +-
math/physics/src/TVector3.cxx | 7 +-
math/smatrix/inc/Math/MConfig.h | 2 +-
math/unuran/CMakeLists.txt | 13 +-
math/unuran/Module.mk | 9 +-
montecarlo/doc/v534/index.html | 25 +-
montecarlo/pythia6/CMakeLists.txt | 8 +-
montecarlo/pythia8/Module.mk | 2 +-
montecarlo/vmc/inc/TVirtualMC.h | 41 +-
montecarlo/vmc/inc/TVirtualMCApplication.h | 9 +-
net/CMakeLists.txt | 6 +-
net/davix/CMakeLists.txt | 18 +
net/davix/Module.mk | 70 +
net/davix/inc/LinkDef.h | 10 +
net/davix/inc/TDavixFile.h | 113 +
net/davix/inc/TDavixFileInternal.h | 134 +
net/davix/inc/TDavixSystem.h | 65 +
net/davix/src/TDavixFile.cxx | 687 +++
net/davix/src/TDavixSystem.cxx | 209 +
net/netx/Module.mk | 26 +-
net/netxng/CMakeLists.txt | 13 +
net/netxng/Module.mk | 83 +
net/netxng/inc/LinkDef.h | 11 +
net/netxng/inc/TNetXNGFile.h | 84 +
net/netxng/inc/TNetXNGFileStager.h | 53 +
net/netxng/inc/TNetXNGSystem.h | 68 +
net/netxng/src/TNetXNGFile.cxx | 798 ++++
net/netxng/src/TNetXNGFileStager.cxx | 195 +
net/netxng/src/TNetXNGSystem.cxx | 376 ++
net/rpdutils/src/rpdutils.cxx | 3 +-
proof/proof/inc/TDataSetManagerAliEn.h | 4 +-
proof/proof/src/TDataSetManagerAliEn.cxx | 120 +-
roofit/histfactory/CMakeLists.txt | 2 +-
roofit/roofitcore/inc/RooAbsArg.h | 5 +
roofit/roofitcore/inc/RooRealSumPdf.h | 2 +-
roofit/roofitcore/inc/RooTrace.h | 39 +-
roofit/roofitcore/src/RooAbsArg.cxx | 38 +-
roofit/roofitcore/src/RooBinnedGenContext.cxx | 14 +-
roofit/roofitcore/src/RooCustomizer.cxx | 17 +-
roofit/roofitcore/src/RooFormula.cxx | 12 +-
roofit/roofitcore/src/RooFormulaVar.cxx | 8 +-
roofit/roofitcore/src/RooNLLVar.cxx | 3 +
roofit/roofitcore/src/RooRealSumPdf.cxx | 15 +-
roofit/roofitcore/src/RooTrace.cxx | 101 +-
roofit/roofitcore/src/RooWorkspace.cxx | 20 +-
roofit/roostats/CMakeLists.txt | 2 +-
sql/pgsql/src/TPgSQLStatement.cxx | 4 +-
test/ios/RootBrowser/AxisFontInspector.h | 25 -
test/ios/RootBrowser/AxisInspector.h | 19 -
test/ios/RootBrowser/AxisInspector.xib | 4646 --------------------
test/ios/RootBrowser/AxisLabelsInspector.h | 33 -
test/ios/RootBrowser/AxisTicksInspector.h | 33 -
test/ios/RootBrowser/AxisTitleInspector.h | 31 -
test/ios/RootBrowser/EditorPlateView.h | 13 -
test/ios/RootBrowser/FileContainerElement.h | 6 -
test/ios/RootBrowser/FileContentController.h | 32 -
test/ios/RootBrowser/FileContentController.xib | 201 -
test/ios/RootBrowser/FileShortcut.h | 24 -
test/ios/RootBrowser/FileShortcut.mm | 106 -
test/ios/RootBrowser/H1BinsInspector.h | 19 -
test/ios/RootBrowser/H1ErrorsInspector.h | 13 -
test/ios/RootBrowser/H1Inspector.h | 14 -
.../RootBrowser/{ => Images/Browser}/directory.png | Bin
.../RootBrowser/{ => Images/Browser}/file_icon.png | Bin
.../Browser}/file_shortcut_background.png | Bin
.../{ => Images/Core}/Default-Landscape.png | Bin
.../{ => Images/Core}/Default-LandscapeLeft.png | Bin
.../{ => Images/Core}/Default-LandscapeRight.png | Bin
.../{ => Images/Core}/Default-Portrait.png | Bin
.../Core}/Default-PortraitUpsideDown.png | Bin
.../ios/RootBrowser/{ => Images/Core}/app_icon.png | Bin
.../{ => Images/CustomUI}/bar-background.png | Bin
.../{ => Images/CustomUI}/bar-highlight.png | Bin
.../{ => Images/CustomUI}/handle-hover.png | Bin
.../RootBrowser/{ => Images/CustomUI}/handle.png | Bin
.../{ => Images/CustomUI}/picker_arrow.png | Bin
.../{ => Images/CustomUI}/picker_bkn.png | Bin
.../{ => Images/CustomUI}/picker_frame_bkn.png | Bin
.../{ => Images/ObjectInspector}/back_btn.png | Bin
.../{ => Images/ObjectInspector}/brush_tab.png | Bin
.../ObjectInspector}/dec_line_width.png | Bin
.../{ => Images/ObjectInspector}/editor_plate.png | Bin
.../ObjectInspector}/editor_state_arrow.png | Bin
.../{ => Images/ObjectInspector}/forward_btn.png | Bin
.../{ => Images/ObjectInspector}/h1_errors_tab.png | Bin
.../{ => Images/ObjectInspector}/h1_tab.png | Bin
.../ObjectInspector}/inc_line_width.png | Bin
.../{ => Images/ObjectInspector}/label_tab.png | Bin
.../{ => Images/ObjectInspector}/lg_tab.png | Bin
.../{ => Images/ObjectInspector}/line_cell.png | Bin
.../ObjectInspector}/line_style_tab.png | Bin
.../ObjectInspector}/line_width_bkn.png | Bin
.../{ => Images/ObjectInspector}/minus_btn.png | Bin
.../{ => Images/ObjectInspector}/plus_btn.png | Bin
.../{ => Images/ObjectInspector}/separator.png | Bin
.../{ => Images/ObjectInspector}/text_cell_bkn.png | Bin
.../{ => Images/ObjectInspector}/ticks_tab.png | Bin
.../{ => Images/ObjectInspector}/title_tab.png | Bin
test/ios/RootBrowser/InspectorWithNavigation.h | 12 -
test/ios/RootBrowser/InspectorWithNavigation.mm | 85 -
test/ios/RootBrowser/LineInspector.h | 27 -
test/ios/RootBrowser/LineStyleCell.h | 7 -
test/ios/RootBrowser/LineWidthCell.h | 8 -
test/ios/RootBrowser/MarkerInspector.h | 20 -
test/ios/RootBrowser/ObjectShortcut.h | 23 -
test/ios/RootBrowser/ObjectShortcut.mm | 135 -
test/ios/RootBrowser/PadImageScrollView.h | 20 -
test/ios/RootBrowser/PadInspector.h | 17 -
test/ios/RootBrowser/PadLogScaleInspector.h | 17 -
test/ios/RootBrowser/PadTicksGridInspector.h | 19 -
test/ios/RootBrowser/ROOTObjectController.h | 28 -
test/ios/RootBrowser/ROOTObjectController.xib | 271 --
.../RootBrowser.xcodeproj/project.pbxproj | 1269 +++---
test/ios/RootBrowser/RootFileController.h | 19 -
test/ios/RootBrowser/RootFileController.mm | 247 --
test/ios/RootBrowser/RootFileController.xib | 398 --
test/ios/RootBrowser/ScrollViewWithPadView.h | 8 -
test/ios/RootBrowser/SearchController.h | 19 -
test/ios/RootBrowser/SelectionView.h | 21 -
test/ios/RootBrowser/Shortcuts.h | 19 -
test/ios/RootBrowser/SlideView.h | 19 -
test/ios/RootBrowser/SlideshowController.h | 21 -
test/ios/RootBrowser/SlideshowController.xib | 261 --
test/ios/RootBrowser/SpotView.h | 5 -
test/ios/RootBrowser/SpotView.mm | 18 -
.../Controllers/FileCollectionViewController.h | 16 +
.../Controllers/FileCollectionViewController.mm | 316 ++
.../Controllers/FileContentViewController.h | 35 +
.../Controllers/FileContentViewController.mm} | 281 +-
.../Src/Browser/Controllers/ObjectViewController.h | 24 +
.../Browser/Controllers/ObjectViewController.mm} | 272 +-
.../Src/Browser/Controllers/SearchViewController.h | 20 +
.../Browser/Controllers/SearchViewController.mm} | 28 +-
.../Browser/Controllers/SlideshowViewController.h | 17 +
.../Controllers/SlideshowViewController.mm} | 140 +-
.../RootBrowser/Src/Browser/FileContainerElement.h | 6 +
.../{ => Src/Browser}/FileContainerElement.mm | 0
.../Src/Browser/Views/FileShortcutView.h | 24 +
.../Src/Browser/Views/FileShortcutView.mm | 111 +
.../Src/Browser/Views/ObjectShortcutView.h | 20 +
.../Src/Browser/Views/ObjectShortcutView.mm | 142 +
.../Src/Browser/Views/PadEditorScrollView.h | 13 +
.../Browser/Views/PadEditorScrollView.mm} | 12 +-
.../RootBrowser/Src/Browser/Views/PadScrollView.h | 26 +
.../Browser/Views/PadScrollView.mm} | 35 +-
.../Src/Browser/Views/PadSelectionView.h | 26 +
.../Browser/Views/PadSelectionView.mm} | 67 +-
.../RootBrowser/Src/Browser/Views/PadSlideView.h | 25 +
.../Browser/Views/PadSlideView.mm} | 20 +-
.../RootBrowser/{ => Src/Browser/Views}/PadView.h | 14 +-
.../RootBrowser/{ => Src/Browser/Views}/PadView.mm | 202 +-
.../RootBrowser/Src/Browser/Views/SpotObjectView.h | 5 +
.../Src/Browser/Views/SpotObjectView.mm | 17 +
.../{root_browser/main.m => Src/Core/main.mm} | 0
.../Core}/root_browserAppDelegate.h | 0
.../Core}/root_browserAppDelegate.mm | 69 +-
.../{ => Src/CustomUI}/HorizontalPickerDelegate.h | 2 +-
.../{ => Src/CustomUI}/HorizontalPickerView.h | 2 +-
.../{ => Src/CustomUI}/HorizontalPickerView.mm | 20 +-
.../RootBrowser/{ => Src/CustomUI}/RangeSlider.h | 20 +-
.../RootBrowser/{ => Src/CustomUI}/RangeSlider.mm | 35 +-
.../{ => Src/CustomUI}/ScrollViewWithPickers.h | 0
.../{ => Src/CustomUI}/ScrollViewWithPickers.mm | 6 +-
.../{ => Src/CustomUI}/TransparentToolbar.h | 0
.../{ => Src/CustomUI}/TransparentToolbar.m | 2 +-
.../Controllers/AxisFontInspector.h | 17 +
.../Controllers}/AxisFontInspector.mm | 107 +-
.../ObjectInspector/Controllers/AxisInspector.h | 22 +
.../ObjectInspector/Controllers}/AxisInspector.mm | 75 +-
.../Controllers/AxisLabelsInspector.h | 21 +
.../Controllers}/AxisLabelsInspector.mm | 85 +-
.../Controllers/AxisTicksInspector.h | 12 +
.../Controllers}/AxisTicksInspector.mm | 103 +-
.../Controllers/AxisTitleInspector.h | 17 +
.../Controllers}/AxisTitleInspector.mm | 82 +-
.../Controllers}/FilledAreaInspector.h | 6 +-
.../Controllers}/FilledAreaInspector.mm | 64 +-
.../ObjectInspector/Controllers/H1BinsInspector.h | 16 +
.../Controllers}/H1BinsInspector.mm | 58 +-
.../Controllers/H1ErrorsInspector.h | 13 +
.../Controllers}/H1ErrorsInspector.mm | 83 +-
.../Src/ObjectInspector/Controllers/H1Inspector.h | 15 +
.../ObjectInspector/Controllers}/H1Inspector.mm | 74 +-
.../Controllers/InspectorWithNavigation.h | 19 +
.../Controllers/InspectorWithNavigation.mm | 62 +
.../ObjectInspector/Controllers/LineInspector.h | 23 +
.../ObjectInspector/Controllers}/LineInspector.mm | 75 +-
.../ObjectInspector/Controllers/MarkerInspector.h | 17 +
.../Controllers}/MarkerInspector.mm | 93 +-
.../ObjectInspector/Controllers}/ObjectInspector.h | 4 +-
.../Controllers}/ObjectInspector.mm | 90 +-
.../Controllers}/ObjectInspectorComponent.h | 7 +-
.../Src/ObjectInspector/Controllers/PadInspector.h | 19 +
.../ObjectInspector/Controllers}/PadInspector.mm | 73 +-
.../Controllers/PadLogScaleInspector.h | 14 +
.../Controllers}/PadLogScaleInspector.mm | 69 +-
.../Controllers/PadTicksGridInspector.h | 10 +
.../Controllers}/PadTicksGridInspector.mm | 71 +-
.../{ => Src/ObjectInspector/Views}/ColorCell.h | 0
.../{ => Src/ObjectInspector/Views}/ColorCell.mm | 12 +-
.../Src/ObjectInspector/Views/EditorPlateView.h | 13 +
.../ObjectInspector/Views}/EditorPlateView.mm | 4 +-
.../{ => Src/ObjectInspector/Views}/EditorView.h | 4 +-
.../{ => Src/ObjectInspector/Views}/EditorView.mm | 35 +-
.../Src/ObjectInspector/Views/LineStyleCell.h | 7 +
.../ObjectInspector/Views}/LineStyleCell.mm | 5 +-
.../Src/ObjectInspector/Views/LineWidthCell.h | 8 +
.../ObjectInspector/Views}/LineWidthCell.mm | 23 +-
.../ObjectInspector/Views}/LineWidthPicker.h | 2 +-
.../ObjectInspector/Views}/LineWidthPicker.mm | 17 +-
.../ObjectInspector/Views}/MarkerStyleCell.h | 2 +-
.../ObjectInspector/Views}/MarkerStyleCell.mm | 6 +-
.../{ => Src/ObjectInspector/Views}/PatternCell.h | 2 +-
.../{ => Src/ObjectInspector/Views}/PatternCell.mm | 11 +-
test/ios/RootBrowser/{ => Src/Utils}/Constants.h | 8 +-
.../{Constants.cxx => Src/Utils/Constants.mm} | 7 +-
test/ios/RootBrowser/{ => Src/Utils}/FileUtils.h | 0
.../{FileUtils.cxx => Src/Utils/FileUtils.mm} | 2 +-
test/ios/RootBrowser/Src/Utils/Shortcuts.h | 20 +
test/ios/RootBrowser/{ => Src/Utils}/Shortcuts.mm | 23 +-
test/ios/RootBrowser/ThumbnailView.h | 49 -
test/ios/RootBrowser/ThumbnailView.mm | 287 --
.../RootBrowser/UI/Browser/Browser_iPad.storyboard | 230 +
.../en.lproj => UI/Core}/MainWindow.xib | 0
.../{ => UI/ObjectInspector}/AxisFontInspector.xib | 0
.../UI/ObjectInspector/AxisInspector.xib | 40 +
.../ObjectInspector}/AxisLabelsInspector.xib | 0
.../ObjectInspector}/AxisTicksInspector.xib | 0
.../ObjectInspector}/AxisTitleInspector.xib | 0
.../ObjectInspector}/FilledAreaInspector.xib | 0
.../{ => UI/ObjectInspector}/H1BinsInspector.xib | 0
.../{ => UI/ObjectInspector}/H1ErrorsInspector.xib | 0
.../{ => UI/ObjectInspector}/H1Inspector.xib | 0
.../{ => UI/ObjectInspector}/LineInspector.xib | 0
.../{ => UI/ObjectInspector}/MarkerInspector.xib | 0
.../{ => UI/ObjectInspector}/PadInspector.xib | 0
.../ObjectInspector}/PadLogScaleInspector.xib | 0
.../ObjectInspector}/PadTicksGridInspector.xib | 0
.../root_browser/root_browser-Info.plist | 34 +-
test/ios/Tutorials/DemoHelper.cxx | 12 +-
test/ios/Tutorials/ExclusionGraphDemo.cxx | 13 +-
test/ios/Tutorials/ExclusionGraphDemo.h | 18 +-
test/ios/Tutorials/H2PolyDemo.cxx | 4 +-
test/ios/Tutorials/H2PolyDemo.h | 18 +-
test/ios/Tutorials/HintView.h | 3 +
test/ios/Tutorials/HintView.mm | 16 +-
test/ios/Tutorials/HsimpleDemo.cxx | 2 +-
test/ios/Tutorials/HsimpleDemo.h | 8 +-
test/ios/Tutorials/LegoDemo.cxx | 2 +-
test/ios/Tutorials/LegoDemo.h | 18 +-
test/ios/Tutorials/PadOptionsController.h | 20 +-
test/ios/Tutorials/PadOptionsController.mm | 208 +-
test/ios/Tutorials/PadView.h | 9 +-
test/ios/Tutorials/PadView.mm | 111 +-
test/ios/Tutorials/PatternCell.h | 3 +
test/ios/Tutorials/PatternCell.mm | 23 +-
test/ios/Tutorials/PictView.h | 4 +-
test/ios/Tutorials/{PictView.m => PictView.mm} | 8 +-
test/ios/Tutorials/PolarGraphDemo.cxx | 2 +-
test/ios/Tutorials/PolarGraphDemo.h | 12 +-
test/ios/Tutorials/SelectionView.mm | 11 +-
test/ios/Tutorials/SurfaceDemo.cxx | 2 +-
test/ios/Tutorials/SurfaceDemo.h | 6 +-
test/ios/Tutorials/Tutorials.xcodeproj/ColorCell.h | 11 -
test/ios/Tutorials/Tutorials.xcodeproj/ColorCell.m | 36 -
.../Tutorials/Tutorials.xcodeproj/project.pbxproj | 61 +-
.../ios/Tutorials/Tutorials/DetailViewController.h | 2 -
.../Tutorials/Tutorials/DetailViewController.mm | 440 +-
test/ios/Tutorials/Tutorials/HelpView.xib | 634 +--
test/ios/Tutorials/Tutorials/RootViewController.mm | 159 +-
.../Tutorials/Tutorials/TutorialsAppDelegate.mm | 52 +-
test/stress.cxx | 23 +-
test/stressGraphics.ref | 94 +-
tmva/CMakeLists.txt | 2 +-
tutorials/roofit/rf507_debugtools.C | 2 +-
342 files changed, 9204 insertions(+), 11295 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/root-system.git
More information about the debian-science-commits
mailing list