From 1ea5f72544b974b6a700d65cfae0f380494c438a Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Tue, 29 Mar 2016 17:21:49 -0700
Subject: ubx: Changed member declaration to satisfy debug builds on Windows

---
 host/lib/usrp/dboard/db_ubx.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/host/lib/usrp/dboard/db_ubx.cpp b/host/lib/usrp/dboard/db_ubx.cpp
index 0bf57cb70..2966cadf6 100644
--- a/host/lib/usrp/dboard/db_ubx.cpp
+++ b/host/lib/usrp/dboard/db_ubx.cpp
@@ -1135,6 +1135,7 @@ private:
     boost::mutex _mutex;
     ubx_cpld_reg_t _cpld_reg;
     uint32_t _prev_cpld_value;
+    std::map<ubx_gpio_field_id_t,ubx_gpio_field_info_t> _gpio_map;
     boost::shared_ptr<max287x_iface> _txlo1;
     boost::shared_ptr<max287x_iface> _txlo2;
     boost::shared_ptr<max287x_iface> _rxlo1;
@@ -1159,7 +1160,6 @@ private:
     size_t _rev;
     double _prev_tx_freq;
     double _prev_rx_freq;
-    std::map<ubx_gpio_field_id_t,ubx_gpio_field_info_t> _gpio_map;
     ubx_gpio_reg_t _tx_gpio_reg;
     ubx_gpio_reg_t _rx_gpio_reg;
     int64_t _tx_sync_delay;
-- 
cgit v1.2.3


From 4c645ff41b074f5ce646f6d231badfc1d06a3556 Mon Sep 17 00:00:00 2001
From: Derek Kozel <derek.kozel@ettus.com>
Date: Mon, 28 Mar 2016 17:35:39 -0700
Subject: Removed mention of OSX PPC support

OS X 10.5.8 is the last release to support PPC (current is 10.11.3) and
the default compilers in that release do not meet UHD's minimum
requirements. Also various dependency versions are not met.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 76d34d0ca..1aa57bc64 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ UHD is primarily developed on Linux, but we also test and support the following
 operating systems.
 
 * Linux (Fedora and Ubuntu)
-* Mac OS X (PPC and Intel)
+* Mac OS X (Intel)
 * Windows 7
 
 Other operating systems will most likely work, too, but are not officially
-- 
cgit v1.2.3


From acb0a2eaee94e467db2970cfdf868be3f06a8265 Mon Sep 17 00:00:00 2001
From: Derek Kozel <derek.kozel@ettus.com>
Date: Mon, 28 Mar 2016 18:03:32 -0700
Subject: Updated URL for USRP image files

Previously there were separate maint and master images. Since 3.8.1
these have been combined at a new URL.
---
 host/docs/images.dox | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/host/docs/images.dox b/host/docs/images.dox
index 1ff9fa7c3..c6f48bc65 100644
--- a/host/docs/images.dox
+++ b/host/docs/images.dox
@@ -24,8 +24,7 @@ The methods of loading images into the device vary among devices:
 
 Pre-built images are available for download.
 
-- <a href="http://files.ettus.com/binaries/master_images/">Master Branch images</a>
-- <a href="http://files.ettus.com/binaries/maint_images/">Maint Branch images</a>
+- <a href="http://files.ettus.com/binaries/images/">Images</a>
 
 The pre-built images come in two forms:
 
-- 
cgit v1.2.3