From: Lars Op den Kamp <lars@opdenkamp.eu>
Date: Wed, 25 Jan 2012 23:28:09 +0000 (+0100)
Subject: Merge branch 'master' into release
X-Git-Tag: upstream/2.2.0~1^2~38
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=ad583a9a7039d857e5988f37b6263c25eec86c24;hp=d0a712a65c05b4bf7bf25eafb8b4c999b6888a42;p=deb_libcec.git

Merge branch 'master' into release
---

diff --git a/ChangeLog b/ChangeLog
index 5478397..ff67255 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,7 +21,7 @@ libcec (1.4-2) unstable; urgency=low
     * fixed possible deadlock because of a negative timeout in
       CAdapterCommunication::WaitForTransmitSucceeded()
     * fixed error message in cec-client (unable to open the device on port ...)
-	* exit cec-client after entering bootloader mode
+    * exit cec-client after entering bootloader mode
     * MSGCODE_START_BOOTLOADER doesn't respond with MSGCODE_COMMAND_ACCEPTED
 
  -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Thu, 25 Jan 2012 23:28:00 +0100
diff --git a/debian/changelog b/debian/changelog
index 5478397..ff67255 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,7 +21,7 @@ libcec (1.4-2) unstable; urgency=low
     * fixed possible deadlock because of a negative timeout in
       CAdapterCommunication::WaitForTransmitSucceeded()
     * fixed error message in cec-client (unable to open the device on port ...)
-	* exit cec-client after entering bootloader mode
+    * exit cec-client after entering bootloader mode
     * MSGCODE_START_BOOTLOADER doesn't respond with MSGCODE_COMMAND_ACCEPTED
 
  -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Thu, 25 Jan 2012 23:28:00 +0100