1. 23 Apr, 2012 1 commit
  2. 30 Mar, 2012 16 commits
  3. 29 Mar, 2012 3 commits
  4. 28 Mar, 2012 4 commits
    • Marcus D. Hanwell's avatar
      Pull in VTK fix for scaling in tiled displays with charts. · 04569390
      Marcus D. Hanwell authored
      Change-Id: I3d72e0ae4d14cef625eace30e598d2208580a9ad
      04569390
    • Marcus D. Hanwell's avatar
      COMP: Stop using deprecated API in scatter plot matrix. · 3fa006d5
      Marcus D. Hanwell authored
      Change-Id: I2bc8a09d746ab890b1c0b3ce639e11b7045815d9
      3fa006d5
    • Marcus D. Hanwell's avatar
      COMP: Added missing include. · 991aabe3
      Marcus D. Hanwell authored
      Change-Id: I2d15966bc06f1899d2efa5231cd13d17e41a33b1
      991aabe3
    • Utkarsh Ayachit's avatar
      Merge remote branch 'origin/master' into charts_in_tile_displays · 405f1867
      Utkarsh Ayachit authored
      * origin/master: (112 commits)
        Update superbuild so netcdf4 will work.
        BUG #12964. More fixes for loading old layouts.
        Update VTK.
        Update superbuild so netcdf4 will work.
        bump vtk to get ability to use netcdf4 with system hdf5
        Move VTK forward
        BUG 13012. Avoid errors when property is not present.
        BUG #12983. Reader had issues reading "time" with different case headers.
        BUG 13010. Add support to save default scalar bar.
        Add "pause" to ensure test playback succeeds in collaboration tests.
        COMP: Downcast vtkRender to vtkOpenGLRender before calling SetPass
        COMP: MantaBenchmark - SetUpdateExtent has to be called on algorithm
        COMP: Update vtkMantaPolyDataMapper to new VTK API
        COMP: pqCPExportStateWizard.cxx - SetInput => SetInputData
        COMP: vtkTesting::RegressionTest(...) now takes vtkAlgorithm
        Move VTK forward
        Move VisItBridge forward
        COMP: IceT code using SetPass(...) which has moved
        Remove protoc complications.
        Bring in protobuf updates to build static protoc executable.
        ...
      
      Conflicts:
      	ParaViewCore/ClientServerCore/vtkPVContextView.cxx
      	ParaViewCore/ServerManager/vtkSMContextViewProxy.cxx
      	VTK
      405f1867
  5. 26 Mar, 2012 16 commits