mirror of
https://github.com/dschmenk/apple2pi.git
synced 2024-11-27 17:51:42 +00:00
Resolve changelog
This commit is contained in:
parent
57fb77b89a
commit
396bbf871d
11
debian/changelog
vendored
11
debian/changelog
vendored
@ -1,15 +1,8 @@
|
||||
a2pi (0.1.8-7) unstable; urgency=low
|
||||
<<<<<<< HEAD
|
||||
a2pi (0.1.8-8) unstable; urgency=low
|
||||
=======
|
||||
|
||||
* Only set GPCLK when using default RPi UART
|
||||
* Full ROM build
|
||||
* 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
|
||||
* Fix cancel from client connect & PIDRIVE
|
||||
|
Loading…
Reference in New Issue
Block a user