Merge branch 'release'

* release: Correct typo in cmakelists conditional. Update version to 3.14.1. Conflicts: VTK
Kitware · Apr 9, 2012 · b0eba06 · b0eba06
2 parents dcaff9f + e32455c
commit b0eba06
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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(

diff --git a/VTK b/VTK