Merge branch 'master' into thumb

[busybox-power] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 510dd1d..ccfecae 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,12 @@ busybox-power (1.20.2power5) unstable; urgency=low
 
  -- Dennis Groenen <tj.groenen@gmail.com>  Wed, 28 Nov 2012 22:30:14 +0100
 
+busybox-power (1.20.2power4+thumb0) unstable; urgency=low
+
+  * Merged master
+
+ -- Dennis Groenen <tj.groenen@gmail.com>  Thu, 25 Oct 2012 21:11:25 +0200
+
 busybox-power (1.20.2power4) unstable; urgency=low
 
   * Divert /bin/busybox during installation
@@ -21,6 +27,12 @@ busybox-power (1.20.2power4) unstable; urgency=low
 
  -- Dennis Groenen <tj.groenen@gmail.com>  Wed, 24 Oct 2012 17:55:14 +0200
 
+busybox-power (1.20.2power3+thumb0) unstable; urgency=low
+
+  * Merged master
+
+ -- Dennis Groenen <tj.groenen@gmail.com>  Sat, 13 Oct 2012 16:24:27 +0200
+
 busybox-power (1.20.2power3) unstable; urgency=low
 
   * Exit shell cleanly upon receiving SIGHUP
@@ -35,6 +47,12 @@ busybox-power (1.20.2power2) unstable; urgency=low
 
  -- Dennis Groenen <tj.groenen@gmail.com>  Wed, 19 Sep 2012 23:39:03 +0200
 
+busybox-power (1.20.2power1-thumb0) unstable; urgency=low
+
+  * Enable thumb compilation
+
+ -- Dennis Groenen <tj.groenen@gmail.com>  Sat, 25 Aug 2012 14:54:55 +0200
+
 busybox-power (1.20.2power1) unstable; urgency=low
 
   * New upstream release (BusyBox 1.20.2)