[xorg-x11-drv-omap: 2/2] fix merge

[Peter Robinson]

commit 59a9049b6d2ca46a937f1f0c81633dcff27e9ffe
Merge: f6b500f 6b734cc
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Jan 15 23:26:43 2013 +0000

    fix merge

 xorg-x11-drv-omap.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc xorg-x11-drv-omap.spec
index 7c6ed3c,2f34119..38aa88d
--- a/xorg-x11-drv-omap.spec
+++ b/xorg-x11-drv-omap.spec
@@@ -60,9 -62,9 +60,12 @@@ find $RPM_BUILD_ROOT -regex ".*\.la$" 
  %{_mandir}/man4/omap.4*
  
  %changelog
 +* Tue Jan 15 2013 Peter Robinson <pbrobinson at fedoraproject.org> 0.4.3-1
 +- Update to the 0.4.3 tagged release
 +
+ * Thu Jan 10 2013 Adam Jackson <ajax at redhat.com> - 0.4.2-3
+ - ABI rebuild
+ 
  * Wed Oct 24 2012 Peter Robinson <pbrobinson at fedoraproject.org> 0.4.2-2
  - Add patch to fix rotation detection