Permalink
Browse files

Merge branch 'release'

* release:
  Correct typo in cmakelists conditional.
  Update version to 3.14.1.

Conflicts:
	VTK
  • Loading branch information...
2 parents dcaff9f + e32455c commit b0eba067c87078d5fe56ec3cb21447f149e1f31a @utkarshayachit utkarshayachit committed Apr 9, 2012
Showing with 3 additions and 3 deletions.
  1. +2 −2 CMakeLists.txt
  2. +1 −1 VTK
View
@@ -61,10 +61,10 @@ ENDIF("${ParaView_SOURCE_DIR}" STREQUAL "${ParaView_BINARY_DIR}")
#########################################################################
SET (PARAVIEW_VERSION_MAJOR 3)
SET (PARAVIEW_VERSION_MINOR 14)
-SET (PARAVIEW_VERSION_PATCH 0)
+SET (PARAVIEW_VERSION_PATCH 1)
SET (PARAVIEW_VERSION_PATCH_EXTRA "enhanced")
SET (PARAVIEW_VERSION "3.14")
-SET (PARAVIEW_VERSION_FULL "3.14.0-enhanced")
+SET (PARAVIEW_VERSION_FULL "3.14.1-enhanced")
INCLUDE(ParaViewDetermineVersion)
determine_version(
2 VTK
Submodule VTK updated from 7145e6 to 046f1a

0 comments on commit b0eba06

Please sign in to comment.