[VirtualGL: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/VirtualGL

[Gary Gatling]

commit fc83cb3f45c5c4276a66779686676d29cc7b3220
Merge: e19ef7f 0b6cc7a
Author: Gary Gatling <gsgatlin at ncsu.edu>
Date:   Sun Jul 22 19:24:54 2012 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/VirtualGL
    
    Conflicts:
    	VirtualGL.spec

 VirtualGL.spec |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --cc VirtualGL.spec
index 8ffeb80,b3b2a84..430e37c
--- a/VirtualGL.spec
+++ b/VirtualGL.spec
@@@ -121,8 -124,8 +121,13 @@@ mv $RPM_BUILD_ROOT%{_libdir}/librrfaker
  
  
  %changelog
++<<<<<<< HEAD
 +* Sun Jul 22 2012 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.1-8
 +- removed BuildRequires:  mxml-devel. see bugzilla 839060.
++=======
+ * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.1-8
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
++>>>>>>> 0b6cc7aec741abed325835d76c441b4b535e093d
  
  * Sat Jul 14 2012 Gary Gatling <gsgatlin at eos.ncsu.edu> - 2.3.1-7
  - added BuildRequires:  mxml-devel for fedora builds only.