[xorg-x11-server/f20: 2/2] Merge branch 'f19' into f20

[Peter Hutterer]

commit 8c3e2a87c0ac0107be52eb04c5b68abbed5815c4
Merge: 20f690c 06e9466
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Nov 13 17:50:03 2013 +1000

    Merge branch 'f19' into f20
    
    Conflicts:
    	xorg-x11-server.spec

 0001-include-export-key_is_down-and-friends.patch |   40 +++++++++++++++++++++
 xorg-x11-server.spec                              |    8 ++++-
 2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --cc xorg-x11-server.spec
index 1f22d07,009d037..a3c9335
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@@ -641,30 -603,21 +644,33 @@@ rm -rf $RPM_BUILD_ROO
  %{xserver_source_dir}
  
  %changelog
+ * Wed Nov 13 2013 Peter Hutterer <peter.hutterer at redhat.com> 1.14.4-3
+ - export key_is_down for tigervnc (#1016152)
+ 
 -* Mon Nov 04 2013 Dave Airlie <airlied at redhat.com> 1.14.4-2
 -- fix ABI breakage introduced in 1.14.3-3
 +* Wed Nov 13 2013 Dave Airlie <airlied at redhat.com> 1.14.4-2
 +- xserver 1.14.4 - resync with f19
  
 -* Mon Nov 04 2013 Peter Hutterer <peter.hutterer at redhat.com> 1.14.4-1
 -- xserver 1.14.4
 +* Wed Nov 13 2013 Dave Airlie <airlied at redhat.com> 1.14.3-8
 +- unbreak ABI in last patches
  
 -* Fri Nov 01 2013 Dave Airlie <airlied at redhat.com> 1.14.3-3
 +* Fri Nov 01 2013 Dave Airlie <airlied at redhat.com> 1.14.3-7
  - backport upstream randr fixes
  
 -* Wed Oct 23 2013 Peter Hutterer <peter.hutterer at redhat.com> 1.14.3-2
 +* Wed Oct 23 2013 Peter Hutterer <peter.hutterer at redhat.com> 1.14.3-6
  - Fix Xdmx cursor jumps (#1019821)
  
 +* Tue Oct 08 2013 Adam Jackson <ajax at redhat.com> 1.14.3-5
 +- Snap wayland damage reports to the bounding box
 +
 +* Thu Oct 03 2013 Adam Jackson <ajax at redhat.com> 1.14.3-4
 +- Fix up fixing up the driver list after filtering out non-wayland
 +
 +* Wed Oct 02 2013 Adam Jackson <ajax at redhat.com> 1.14.3-3
 +- Only look at wayland-capable drivers when run with -wayland
 +
 +* Mon Sep 23 2013 Adam Jackson <ajax at redhat.com> 1.14.3-2
 +- xwayland support
 +
  * Mon Sep 16 2013 Peter Hutterer <peter.hutterer at redhat.com> 1.14.3-1
  - xserver 1.14.3