Skip to content
  • Utkarsh Ayachit's avatar
    Merge remote branch 'origin/master' into Collaboration · 865c7658
    Utkarsh Ayachit authored
    * origin/master: (303 commits)
      Properly set the export visibility for pqDisplayArrayWidget.
      Move pqDisplayArrayWidget into Qt/Components so it is easier to use.
      Fix segfault on shutdown in manta plugin.
      Add missing doc for xdmf reader
      Fix append slot in multiresolution streaming.
      Added some documentation to the OpenFOAM reader in the readers' XML.
      Add some documentation inside Proxy XML definition
      Fixed extra data-delivery when outline was used for LOD.
      Making it possible to change default manipulator configuration.
      Making it possible to change default manipulator configuration.
      Fix vtkmanta resize
      Remove dead manta renderwindow class
      Fix dark initial images in MantaView.
      Silence messages from Manta plugin with non Manta views.
      Standardize MantaViews directory structure and PQ level view.
      Fix vtkmanta resize
      Sync pvtkpython interface library fix.
      Sync pvtkpython fix.
      Remove dead manta renderwindow class
      Fix dark initial images in MantaView.
      ...
    
    Conflicts:
    	Qt/Components/pqSelectionManager.cxx
    	Qt/Core/pqPluginManager.cxx
    	Servers/Common/vtkPVDataInformation.cxx
    	Servers/Filters/vtkFileSeriesWriter.cxx
    	Servers/ServerManager/CMakeLists.txt
    	Servers/ServerManager/vtkSMComparativeViewProxy.cxx
    	Servers/ServerManager/vtkSMComparativeViewProxy.h
    	Servers/ServerManager/vtkSMFetchDataProxy.cxx
    	Servers/ServerManager/vtkSMOutputPort.cxx
    	Servers/ServerManager/vtkSMOutputPort.h
    	Servers/ServerManager/vtkSMStateLoader.cxx
    	Utilities/VTKPythonWrapping/paraview/servermanager.py
    865c7658