[ovito] 03/08: Merge.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository ovito.

commit cdf171d161ce9e72be042d473be2d668f1f0f9b0
Merge: c0c572b 942ec5a
Author: Anton Gladky <gladk at debian.org>
Date:   Thu May 29 21:50:16 2014 +0200

    Merge.

 .gitignore                                         |   1 -
 CMakeLists.txt                                     |  17 +-
 README.txt                                         |  21 +-
 doc/develop/build_linux_howto.txt                  |  15 +-
 doc/develop/feature_requests.txt                   |   1 -
 .../reference/rendering/render_settings.docbook    |   2 +-
 src/3rdparty/video/CMakeLists.txt                  |   3 +
 src/core/gui/actions/FileActions.cpp               |   1 +
 src/core/gui/dialogs/GeneralSettingsPage.cpp       |  53 ++
 src/core/gui/dialogs/GeneralSettingsPage.h         |   4 +
 src/core/gui/mainwin/MainWindow.cpp                |  35 +-
 src/core/gui/mainwin/MainWindow.h                  |   6 +-
 .../gui/properties/VariantComboBoxParameterUI.cpp  |  44 +-
 .../gui/properties/VariantComboBoxParameterUI.h    |   3 +
 src/core/gui/widgets/general/ColorPickerWidget.cpp |  45 +-
 src/core/gui/widgets/general/ColorPickerWidget.h   |   8 +-
 .../gui/widgets/rendering/FrameBufferWidget.cpp    |  26 +-
 src/core/gui/widgets/rendering/FrameBufferWidget.h |  14 +-
 src/core/rendering/RenderSettingsEditor.cpp        |   2 +-
 .../rendering/standard/StandardSceneRenderer.cpp   |   1 +
 .../rendering/standard/StandardSceneRenderer.h     |   2 +-
 .../rendering/viewport/ViewportSceneRenderer.cpp   |   7 +-
 .../mainwin/command_panel/about_panel.html         |   3 +-
 src/core/viewport/ViewportWindow.cpp               |  84 ++-
 src/core/viewport/ViewportWindow.h                 |   9 +
 src/main/CMakeLists.txt                            |   2 +-
 src/plugins/crystalanalysis/CMakeLists.txt         |   2 +-
 src/plugins/netcdf/CMakeLists.txt                  |  15 +
 src/plugins/netcdf/NetCDFImporter.cpp              | 297 ++++++----
 src/plugins/netcdf/NetCDFImporter.h                |   3 +
 src/plugins/particles/CMakeLists.txt               |   7 +-
 src/plugins/particles/data/SimulationCell.h        |  16 +
 src/plugins/particles/data/SimulationCellData.h    |  17 +
 .../analysis/binandreduce/BinAndReduceModifier.cpp | 611 +++++++++++++++++++++
 .../analysis/binandreduce/BinAndReduceModifier.h   | 283 ++++++++++
 .../analysis/scatterplot/ScatterPlotModifier.cpp   |   1 +
 .../analysis/scatterplot/ScatterPlotModifier.h     |   1 +
 .../particles/util/OnTheFlyNeighborListBuilder.cpp |  15 +-
 .../particles/util/TreeNeighborListBuilder.cpp     |  10 +-
 src/plugins/tachyon/renderer/TachyonRenderer.cpp   |  48 +-
 src/plugins/tachyon/renderer/TachyonRenderer.h     |  75 ++-
 .../tachyon/renderer/TachyonRendererEditor.cpp     |  10 +-
 42 files changed, 1554 insertions(+), 266 deletions(-)

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