[SCM] mplayer/master.experimental: update debian/changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.experimental branch:
commit 7c4458c85458678eb415522e7563e5bf8632fb7b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 23 22:22:17 2011 +0100

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 52c257f..5fcb961 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
 mplayer (2:1.0~rc4~try2.dfsg1-1) experimental; urgency=low
 
-  * new upstream snapshot
+  [ steph ]
+  * enable joystick at compilation but leave it disable in config
+    (Closes: #592082, LP: #617986)
+
+  [ Reinhard Tartler ]
+  * new upstream snapshot, remove patches that are applied upstream
+  * minor clarifications in debian/copyright
 
  -- Reinhard Tartler <siretart at tauware.de>  Sun, 23 Jan 2011 21:59:46 +0100
 

-- 
mplayer packaging