[SCM] x264/master: Update changelog

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

The following commit has been merged in the master branch:
commit b36668660b2b76480ae6c601bdb2533ae5aa2786
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Fri May 25 07:38:27 2012 +0200

    Update changelog

diff --git a/debian/changelog b/debian/changelog
index 47ef3ac..0b6d982 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-x264 (2:0.123.2189+git35cf912-2) UNRELEASED; urgency=low
+x264 (2:0.124.2198+git1c97f35-1) UNRELEASED; urgency=low
 
-  * Prepare for new upload.
+  * Update to new upstream snapshot
+  * Imported Upstream version 0.124.2198+git1c97f35
+  * Regenerate manpage
+  * Regenerate debian/control
 
- -- Andres Mejia <amejia at debian.org>  Thu, 03 May 2012 21:57:24 -0400
+ -- Rico Tzschichholz <ricotz at ubuntu.com>  Fri, 25 May 2012 07:37:26 +0200
 
 x264 (2:0.123.2189+git35cf912-1) unstable; urgency=low
 

-- 
x264 packaging