summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-06-21 15:36:14 -0400
committerTom Rondeau <trondeau@vt.edu>2013-06-21 15:36:14 -0400
commit5382a752424b0b60379de69aa55e0bd410f1a690 (patch)
tree31a29ec6b3fd089ff7ed9f284fbdc92b0f4bb8bf
parent5653dcfb4f3a836523921e014d2aa50014514e58 (diff)
parent22f260175fba41b64a60857c9b3353803b402368 (diff)
Merge branch 'master' of git.gnuradio.org:gnuradio
-rw-r--r--CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45ccc2962f..161017bc09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,8 +41,8 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
# Set the version information here
set(VERSION_INFO_MAJOR_VERSION 3)
set(VERSION_INFO_API_COMPAT 7)
-set(VERSION_INFO_MINOR_VERSION 0)
-set(VERSION_INFO_MAINT_VERSION git)
+set(VERSION_INFO_MINOR_VERSION 0rc0)
+set(VERSION_INFO_MAINT_VERSION 0)
include(GrVersion) #setup version info
# Append -O2 optimization flag for Debug builds