diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-06-29 10:38:56 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-06-29 10:38:56 -0700 |
| commit | c5c4764d9b090a4f1435ddfd7fb5eb73f65557b1 (patch) | |
| tree | 5d3a37364029dca6a2258611a747b367447298f3 /host/lib | |
| parent | 9132fab60945f8665cac71a6921fd7e90ad68ec3 (diff) | |
| parent | b2ae3b2d86e2cc6400cfc94b57054fdd9128e923 (diff) | |
| download | uhd-c5c4764d9b090a4f1435ddfd7fb5eb73f65557b1.tar.gz uhd-c5c4764d9b090a4f1435ddfd7fb5eb73f65557b1.tar.bz2 uhd-c5c4764d9b090a4f1435ddfd7fb5eb73f65557b1.zip | |
Merge branch 'maint'
Conflicts:
host/lib/usrp/b200/b200_impl.cpp
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/uhd.rc.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/uhd.rc.in b/host/lib/uhd.rc.in index a0eb27b8c..051511327 100644 --- a/host/lib/uhd.rc.in +++ b/host/lib/uhd.rc.in @@ -1,4 +1,4 @@ -#include <afxres.h> +#include <windows.h> VS_VERSION_INFO VERSIONINFO FILEVERSION @TRIMMED_VERSION_MAJOR@,@TRIMMED_VERSION_MINOR@,@RC_TRIMMED_VERSION_PATCH@,@UHD_GIT_COUNT@ |