diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-01-29 17:42:49 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-01-29 17:42:49 +0100 |
| commit | 5bbcbaa397d596025c2a1d9db40c683b191a751b (patch) | |
| tree | b9cf2b93d13b5a41404fff803373df6f34877541 /host/lib/uhd.rc.in | |
| parent | b92662d5780f3a2d872e5ab96efc0760cce1fe53 (diff) | |
| parent | d3bdb8f1602fda76e0a5a2578cb06902abfe7209 (diff) | |
| download | uhd-5bbcbaa397d596025c2a1d9db40c683b191a751b.tar.gz uhd-5bbcbaa397d596025c2a1d9db40c683b191a751b.tar.bz2 uhd-5bbcbaa397d596025c2a1d9db40c683b191a751b.zip | |
Merge branch 'maint'
Conflicts:
fpga-src
Diffstat (limited to 'host/lib/uhd.rc.in')
| -rw-r--r-- | host/lib/uhd.rc.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/uhd.rc.in b/host/lib/uhd.rc.in index feb006bd3..a0eb27b8c 100644 --- a/host/lib/uhd.rc.in +++ b/host/lib/uhd.rc.in @@ -1,8 +1,8 @@ #include <afxres.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION @TRIMMED_VERSION_MAJOR@,@TRIMMED_VERSION_MINOR@,@TRIMMED_VERSION_PATCH@,@UHD_GIT_COUNT@ - PRODUCTVERSION @TRIMMED_VERSION_MAJOR@,@TRIMMED_VERSION_MINOR@,@TRIMMED_VERSION_PATCH@,@UHD_GIT_COUNT@ + FILEVERSION @TRIMMED_VERSION_MAJOR@,@TRIMMED_VERSION_MINOR@,@RC_TRIMMED_VERSION_PATCH@,@UHD_GIT_COUNT@ + PRODUCTVERSION @TRIMMED_VERSION_MAJOR@,@TRIMMED_VERSION_MINOR@,@RC_TRIMMED_VERSION_PATCH@,@UHD_GIT_COUNT@ FILEFLAGSMASK 0x3fL #ifndef NDEBUG FILEFLAGS 0x0L |