[SCM] xvidcore/master: update debian/changelog

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

The following commit has been merged in the master branch:
commit 6ad112924fc61eae2d7de14d3a1cb98c5f7f2760
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Thu Jul 28 17:13:15 2011 +0200

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 6db55eb..8eccef6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xvidcore (2:1.3.2-5) unstable; urgency=low
 
   * 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 15:44:44 +0200
+ -- Fabian Greffrath <fabian+debian at greffrath.com>  Thu, 28 Jul 2011 17:12:50 +0200
 
 xvidcore (2:1.3.2-4) unstable; urgency=low
 

-- 
xvidcore packaging