diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2013-05-10 15:07:03 -0700 |
|---|---|---|
| committer | Nicholas Corgan <nick.corgan@ettus.com> | 2013-05-10 15:07:03 -0700 |
| commit | 6524f46bc54c36f8d50d6a3aa1c17aafb0a47d75 (patch) | |
| tree | 40a0cf8ec54bae728041d7304ecd841339bace81 /host/lib/uhd.rc.in | |
| parent | c6dcb2b4b63841925f4863bc0adbda9b2048475a (diff) | |
| parent | 4b72513a8930ec4147dab76c079afa1186e335cd (diff) | |
| download | uhd-6524f46bc54c36f8d50d6a3aa1c17aafb0a47d75.tar.gz uhd-6524f46bc54c36f8d50d6a3aa1c17aafb0a47d75.tar.bz2 uhd-6524f46bc54c36f8d50d6a3aa1c17aafb0a47d75.zip | |
Merge branch 'maint'
Conflicts:
host/tests/CMakeLists.txt
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 01a5e07f5..feb006bd3 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 @RC_VERSION_MAJOR@,@RC_VERSION_MINOR@,@RC_VERSION_PATCH@,@UHD_GIT_COUNT@ - PRODUCTVERSION @RC_VERSION_MAJOR@,@RC_VERSION_MINOR@,@RC_VERSION_PATCH@,@UHD_GIT_COUNT@ + 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@ FILEFLAGSMASK 0x3fL #ifndef NDEBUG FILEFLAGS 0x0L |