[xorg-x11-drv-wacom/f15/master: 3/3] Merge branch 'master' into f15

[Peter Hutterer]

commit 8084e64d4635c0224b5468fb17573f3ec3e8df12
Merge: 33286be 649927d
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Mar 16 07:57:10 2011 +1000

    Merge branch 'master' into f15
    
    Conflicts:
    	xorg-x11-drv-wacom.spec

 .gitignore              |    2 ++
 sources                 |    2 +-
 xorg-x11-drv-wacom.spec |   12 +++++++++---
 3 files changed, 12 insertions(+), 4 deletions(-)
---
diff --cc xorg-x11-drv-wacom.spec
index 5047e9b,b9eeed0..a70e03f
--- a/xorg-x11-drv-wacom.spec
+++ b/xorg-x11-drv-wacom.spec
@@@ -96,9 -96,12 +96,15 @@@ X.Org X11 wacom input driver developmen
  %{_bindir}/isdv4-serial-debugger
  
  %changelog
+ * Tue Mar 15 2011 Peter Hutterer <peter.hutterer at redhat.com> 0.10.99-1.20110315
+ - Today's git snapshot
+ 
+ * Thu Feb 17 2011 Peter Hutterer <peter.hutterer at redhat.com> 0.10.11-1
+ - wacom 0.10.11
+ 
 +* Thu Mar 10 2011 Adam Jackson <ajax at redhat.com> - 0.10.10-4.20101122
 +- xserver 1.10 ABI rebuild
 +
  * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.10-3.20101122
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild