Conflicts:
	debian/changelog
	pidrive/makefile
This commit is contained in:
David Schmenk 2014-08-01 19:54:21 -07:00
commit 57fb77b89a
4 changed files with 10 additions and 0 deletions

10
debian/changelog vendored
View File

@ -1,4 +1,14 @@
a2pi (0.1.8-7) unstable; urgency=low 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 * Only set GPCLK on default RPi UART
* Stabilize request/pidrive interaction * Stabilize request/pidrive interaction

0
share/UTILS.PO Executable file → Normal file
View File

BIN
share/a2pi.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

BIN
share/a2pi.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB