diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2013-11-19 15:56:02 -0800 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2013-11-19 15:56:02 -0800 |
| commit | 0ae04b96df8dd4a9fc34fb3b4e92f0f7924f30fe (patch) | |
| tree | 03f0fb475a8a6ff0aed7346c9d8705245f412352 /host | |
| parent | 621f9c93f345b7f2f6d061fe503ac71b042c4d32 (diff) | |
| parent | 3c6a906c59ff007fd1ee2664771bea937bcc2a75 (diff) | |
| download | uhd-0ae04b96df8dd4a9fc34fb3b4e92f0f7924f30fe.tar.gz uhd-0ae04b96df8dd4a9fc34fb3b4e92f0f7924f30fe.tar.bz2 uhd-0ae04b96df8dd4a9fc34fb3b4e92f0f7924f30fe.zip | |
Merge branch 'maint'
Conflicts:
host/CMakeLists.txt
Diffstat (limited to 'host')
| -rw-r--r-- | host/cmake/Modules/UHDVersion.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake index 8e14b26bf..6eb3a9cab 100644 --- a/host/cmake/Modules/UHDVersion.cmake +++ b/host/cmake/Modules/UHDVersion.cmake @@ -27,7 +27,7 @@ FIND_PACKAGE(Git QUIET) ######################################################################## SET(UHD_VERSION_MAJOR 003) SET(UHD_VERSION_MINOR 005) -SET(UHD_VERSION_PATCH 004) +SET(UHD_VERSION_PATCH 005) ######################################################################## # Set up trimmed version numbers for DLL resource files and packages |