Merge branch 'master' of https://github.com/dschmenk/apple2pi

Conflicts: debian/changelog pidrive/makefile
2014-08-01 19:54:21 -07:00 · 2014-08-01 19:54:21 -07:00 · 57fb77b89a
parent eeb3e24433 73345729f9
commit 57fb77b89a
4 changed files with 10 additions and 0 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,4 +1,14 @@
 a2pi (0.1.8-7) unstable; urgency=low
+<<<<<<< HEAD
+=======
+
+  * Only set GPCLK when using default RPi UART
+  * Add a2pi logo with transparent background
+
+ -- David Schmenk <dschmenk@gmail.com>  Sat, 07 Jul 2014 12:46:00 -0800
+
+a2pi (0.1.8-6) unstable; urgency=low
+>>>>>>> 73345729f9cba82fa6ecf52054c6c442f7e315c8

  * Only set GPCLK on default RPi UART
  * Stabilize request/pidrive interaction
--- a/share/UTILS.PO
+++ b/share/UTILS.PO
--- a/share/a2pi.jpg
+++ b/share/a2pi.jpg
--- a/share/a2pi.png
+++ b/share/a2pi.png