1. 04 Nov, 2014 2 commits
  2. 03 Nov, 2014 13 commits
  3. 02 Nov, 2014 2 commits
  4. 01 Nov, 2014 5 commits
  5. 31 Oct, 2014 12 commits
  6. 30 Oct, 2014 6 commits
    • Chuck Atkins's avatar
      Merge branch 'update-vtk' into pv-master · 6a6f7705
      Chuck Atkins authored
      Change-Id: I7b5f404685026e65ccb70aa9d5c56fb0f0332505
      6a6f7705
    • Chuck Atkins's avatar
      Merge branch 'master' into update-vtk · c78762b3
      Chuck Atkins authored
      * master: (439 commits)
        Trivial fixes for API change in OpenGL2 shaders
        Update baselines due to text rendering changes.
        FIX: Bypass testing if OpenGL extensions not supported
        XMLReader: Prevent streams from being closed when they don't exist.
        FIX: Make sure context is present
        vtkInformationDataObjectKey: move to CommonDataModel
        ENH: Volume Mapper benchmark test
        zlib: remove empty if statements
        cmake: fix up some version checks
        FindTBB: fix up typo'd logic
        cmake: remove @var@ expansions
        cmake: remove arguments to else and endfoo commands
        cmake: remove arguments from else and endfoo in zlib
        cmake: remove arguments from else and endfoo in xdmf3
        cmake: remove arguments from else and endfoo in xdmf2
        cmake: remove arguments from else and endfoo in VPIC
        cmake: remove arguments from else and endfoo in verdict
        cmake: remove arguments from else and endfoo in tiff
        cmake: remove arguments from else and endfoo in TclTk
        cmake: remove arguments from else and endfoo in sqlite
        ...
      
      Change-Id: I4116b0a7e5eb876a7ba17e3103805b9d1da13021
      c78762b3
    • Chuck Atkins's avatar
      Merge branch 'master' into pv-master · a306bc69
      Chuck Atkins authored
      * master: (439 commits)
        Trivial fixes for API change in OpenGL2 shaders
        Update baselines due to text rendering changes.
        FIX: Bypass testing if OpenGL extensions not supported
        XMLReader: Prevent streams from being closed when they don't exist.
        FIX: Make sure context is present
        vtkInformationDataObjectKey: move to CommonDataModel
        ENH: Volume Mapper benchmark test
        zlib: remove empty if statements
        cmake: fix up some version checks
        FindTBB: fix up typo'd logic
        cmake: remove @var@ expansions
        cmake: remove arguments to else and endfoo commands
        cmake: remove arguments from else and endfoo in zlib
        cmake: remove arguments from else and endfoo in xdmf3
        cmake: remove arguments from else and endfoo in xdmf2
        cmake: remove arguments from else and endfoo in VPIC
        cmake: remove arguments from else and endfoo in verdict
        cmake: remove arguments from else and endfoo in tiff
        cmake: remove arguments from else and endfoo in TclTk
        cmake: remove arguments from else and endfoo in sqlite
        ...
      
      Change-Id: Ib25c67a3bb53c99987a185fc96f5974bec2b084f
      a306bc69
    • Chuck Atkins's avatar
      Merge topic 'fix-xml-crash-on-close' into master · 8751825c
      Chuck Atkins authored
      03f893bf XMLReader: Prevent streams from being closed when they don't exist.
      8751825c
    • Aashish Chaudhary's avatar
      Merge topic 'volume-rendering-benchmark' into master · 08811c3b
      Aashish Chaudhary authored
      3f787161 FIX: Bypass testing if OpenGL extensions not supported
      b3abe909 FIX: Make sure context is present
      933c76ab ENH: Volume Mapper benchmark test
      08811c3b
    • Marcus D. Hanwell's avatar
      Merge topic 'opengl2-minor-fixes' into master · 025b51be
      Marcus D. Hanwell authored
      b566db36 Trivial fixes for API change in OpenGL2 shaders
      025b51be