xorg-server: Changes to 'ubuntu-quantal'

[Timo Aaltonen <tjaalton-guest@alioth.debian.org>]

 debian/changelog |   13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

New commits:
commit 35f17ad1be18016a91dbfdc736cadf811c3d354b
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date:   Tue Nov 27 08:11:00 2012 +0200

    fix the changelog, we're releasing -0u6.1 after all

diff --git a/debian/changelog b/debian/changelog
index dc6b5b7..1eec1d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-xorg-server (2:1.13.0-0ubuntu6.2) quantal-proposed; urgency=low
-
-  * Revert the change to 500_pointer_barrier_thresholds.diff, causes
-    issues with unity launcher.
-
- -- Timo Aaltonen <tjaalton@ubuntu.com>  Thu, 22 Nov 2012 17:30:15 +0200
-
 xorg-server (2:1.13.0-0ubuntu6.1) quantal-proposed; urgency=low
 
   [ Maarten Lankhorst ]
@@ -21,11 +14,7 @@ xorg-server (2:1.13.0-0ubuntu6.1) quantal-proposed; urgency=low
     transformation matrix to an identity matrix.  Thanks to a7x.
     (LP: #1041063)
 
-  [ Tim Lunn ]
-  * 500_pointer_barrier_thresholds.diff: Update to fix gaps above
-    barriers at edge of screen (LP: #1073724)
-
- -- Bryce Harrington <bryce@ubuntu.com>  Fri, 16 Nov 2012 15:56:23 -0800
+ -- Timo Aaltonen <tjaalton@ubuntu.com>  Tue, 27 Nov 2012 08:09:59 +0200
 
 xorg-server (2:1.13.0-0ubuntu6) quantal; urgency=low