[SCM] xvidcore/master: update debian/changelog

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2092c17bbf8ccb2c3b25ff76ebdfa51ee4bf1119
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Fri Jul 29 10:08:41 2011 +0200

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 8eccef6..d105944 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
 xvidcore (2:1.3.2-5) unstable; urgency=low
 
+  * Introduce a debian/confflags file to conditionally disable
+    assembly optimizations on certain archs until we introduce flavours.
   * Disable yasm support for kfreebsd-amd64 again, it is known
     to be broken and also disabled in FreeBSD (Closes: #635719).
-  * Explicitely Build-Conflict against yasm on kfreebsd-amd64.
 
- -- Fabian Greffrath <fabian+debian at greffrath.com>  Thu, 28 Jul 2011 17:12:50 +0200
+ -- Fabian Greffrath <fabian+debian at greffrath.com>  Fri, 29 Jul 2011 10:07:49 +0200
 
 xvidcore (2:1.3.2-4) unstable; urgency=low
 

-- 
xvidcore packaging