Fix merge error.
This commit is contained in:
parent
77ce7d7d71
commit
0479b733c5
@ -1,7 +1,7 @@
|
||||
Summary: Development Libraries and headers for EFI
|
||||
Name: gnu-efi
|
||||
Version: 3.0e
|
||||
Release: 14%{?dist}
|
||||
Release: 15%{?dist}
|
||||
Group: Development/System
|
||||
License: GPLv2+
|
||||
URL: ftp://ftp.hpl.hp.com/pub/linux-ia64
|
||||
@ -69,16 +69,14 @@ rm -rf %{buildroot}
|
||||
%attr(0644,root,root) /boot/efi/EFI/redhat/*.efi
|
||||
|
||||
%changelog
|
||||
<<<<<<< HEAD
|
||||
* Thu Aug 11 2011 Peter Jones <pjones@redhat.com> - 3.0e-14
|
||||
* Thu Aug 11 2011 Peter Jones <pjones@redhat.com> - 3.0e-15
|
||||
- Correctly pad the stack when doing uefi calls
|
||||
Related: rhbz#677468
|
||||
- Add ability to write UEFI callbacks and drivers
|
||||
- Add test harness for ABI Calling Conventions
|
||||
=======
|
||||
|
||||
* Thu Jun 16 2011 Peter Jones <pjones@redhat.com> - 3.0e-14
|
||||
- Handle uninitialized GOP driver gracefully.
|
||||
>>>>>>> b38a657b7181bc66628b4814d2643f8a4da8192b
|
||||
|
||||
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0e-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
Loading…
Reference in New Issue
Block a user