Merge branch 'raspbian/wheezy' into raspbian/jessie

This commit is contained in:
Iwan Timmer
2016-03-01 20:48:33 +01:00
7 changed files with 26 additions and 19 deletions

10
debian/changelog vendored
View File

@@ -1,4 +1,14 @@
<<<<<<< HEAD
moonlight-embedded (2.1.3-1jessie1) RELEASED; urgency=high
=======
moonlight-embedded (2.1.4-1wheezy1) RELEASED; urgency=high
* Update to version 2.1.4
-- Iwan Timmer <irtimmer@gmail.com> Tue, 1 Mar 2016 20:23:54 +0200
moonlight-embedded (2.1.3-1wheezy1) RELEASED; urgency=high
>>>>>>> raspbian/wheezy
* Update to version 2.1.3