[visit] 03/03: Merge tag 'upstream_2.9.2' into dev-2.9.2

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch dev-2.9.2
in repository visit.

commit 08d4ae84f7f9ab602ffae54530081f2cfcb42884
Merge: 5d2e2d0 049d5c5
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Jun 17 07:55:04 2015 +0100

    Merge tag 'upstream_2.9.2' into dev-2.9.2

 src/INSTALL_NOTES                                  |   18 +-
 src/SVN_REVISION                                   |    2 +-
 src/VERSION                                        |    2 +-
 src/avt/Filters/avtCoordSystemConvert.C            |    4 +
 src/avt/Filters/avtFacelistFilter.C                |   52 +-
 src/avt/Filters/avtXRayFilter.C                    |  515 ++++-
 src/avt/Filters/avtXRayFilter.h                    |   25 +-
 src/avt/Pipeline/Data/avtDataTree.C                |   37 +
 src/avt/Pipeline/Data/avtDataTree.h                |    2 +
 src/avt/Pipeline/Data/avtDataset.h                 |    1 +
 src/avt/Pipeline/Sinks/avtDatabaseWriter.C         |    2 +
 src/avt/Queries/Queries/avtXRayImageQuery.C        |  311 ++-
 src/avt/Queries/Queries/avtXRayImageQuery.h        |   26 +-
 src/bin/internallauncher                           |   37 +-
 src/config-site/rzuseqlac2-compute.cmake           |   13 +-
 src/config-site/rzuseqlac2-login.cmake             |   12 +-
 src/config-site/thembisa.cmake                     |    4 +-
 src/databases/CMakeLists.txt                       |    4 +-
 src/databases/Exodus/avtExodusFileFormat.C         |   15 +-
 .../FieldViewXDB/lib/Mac64/libVXDB_par.dylib       |  Bin 186652 -> 400964 bytes
 .../FieldViewXDB/lib/Mac64/libVXDB_ser.dylib       |  Bin 178284 -> 396692 bytes
 src/databases/Miranda/avtMirandaFileFormat.C       | 2172 ++++++++++----------
 src/databases/Miranda/avtMirandaFileFormat.h       |    2 +-
 src/databases/NETCDF/avtBasicNETCDFReader.C        |   12 +
 src/databases/Tecplot/avtTecplotFileFormat.C       |   32 +-
 src/gui/QvisGUIApplication.C                       |   29 +-
 src/gui/QvisXRayImageQueryWidget.C                 |  304 ++-
 src/gui/QvisXRayImageQueryWidget.h                 |   35 +-
 src/gui/SplashScreen.C                             |    5 +-
 src/operators/CoordSwap/avtCoordSwapFilter.C       |   38 +
 src/operators/IndexSelect/avtIndexSelectFilter.C   |  981 +++++++--
 src/operators/IndexSelect/avtIndexSelectFilter.h   |   32 +-
 src/plots/Label/CellLabels_body.C                  |   28 +
 src/plots/Label/NodeLabels_body.C                  |   44 +-
 src/plots/Label/avtLabelFilter.C                   |  192 +-
 src/plots/Label/avtLabelFilter.h                   |   14 +
 src/plots/Label/avtLabelPlot.C                     |    8 +
 src/resources/help/en_US/relnotes2.9.2.html        |   57 +
 src/resources/hosts/llnl/host_llnl_rzgw_rzuseq.xml |    2 +-
 src/resources/hosts/nersc/customlauncher           |   14 +-
 src/resources/hosts/umich/host_umich_flux.xml      |  149 +-
 src/sim/V2/lib/VisItControlInterface_V2.c          |   13 +-
 src/sim/V2/lib/VisItFortran.h                      |    3 +
 src/sim/V2/lib/visitfortransimV2interface.c        |    2 +
 src/sim/V2/runtime/SimEngine.C                     |  167 +-
 src/sim/V2/runtime/VisItControlInterfaceRuntime.C  |    5 +-
 src/svn_bin/build_visit                            |    2 +-
 src/svn_bin/build_visit_BGQ                        |    2 +-
 src/svn_bin/bv_support/bv_cgns.sh                  |   68 +-
 src/svn_bin/filter_link_commands_BGQ.sh            |   28 +
 src/svn_bin/visit-build-open                       |   85 +-
 src/svn_bin/visit-create-chksums                   |   36 +-
 src/svn_bin/visit-install                          |    5 +-
 src/svn_bin/visit-install-open                     |   49 +-
 .../contrib/pjacobi/F90/PJacobi_InSitu.f           |   17 +-
 src/viewer/core/ViewerWindow.C                     |    6 +-
 src/viewer/main/ViewerSubject.C                    |  152 +-
 src/visitpy/cli/cli.C                              |    8 +
 58 files changed, 4245 insertions(+), 1635 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/visit.git