diff options
| author | Josh Blum <josh@joshknows.com> | 2011-04-30 17:11:46 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-04-30 17:11:46 -0700 |
| commit | 493ed897f24fff5265b766ee634916b002cadf94 (patch) | |
| tree | 09082fa8be0c71b92ca668083dd1519a452b679d /host/Modules/UHDVersion.cmake | |
| parent | 7b509d6fe4ac4cfcafc63f11f5b298d3e0237acd (diff) | |
| parent | 1e57d1c0496ca6263652cd84c9eeacafde833915 (diff) | |
| download | uhd-493ed897f24fff5265b766ee634916b002cadf94.tar.gz uhd-493ed897f24fff5265b766ee634916b002cadf94.tar.bz2 uhd-493ed897f24fff5265b766ee634916b002cadf94.zip | |
Merge branch 'master' into next
Conflicts:
host/lib/usrp/usrp2/usrp2_regs.cpp
Diffstat (limited to 'host/Modules/UHDVersion.cmake')
| -rw-r--r-- | host/Modules/UHDVersion.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/Modules/UHDVersion.cmake b/host/Modules/UHDVersion.cmake index 86d3133a8..abee8f509 100644 --- a/host/Modules/UHDVersion.cmake +++ b/host/Modules/UHDVersion.cmake @@ -26,8 +26,8 @@ FIND_PACKAGE(Git QUIET) # - increment patch on for bug fixes and docs ######################################################################## SET(UHD_VERSION_MAJOR 003) -SET(UHD_VERSION_MINOR 000) -SET(UHD_VERSION_PATCH 001) +SET(UHD_VERSION_MINOR 001) +SET(UHD_VERSION_PATCH 000) ######################################################################## # Version information discovery through git log |