rpms/gnu-efi
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix merge error.

Browse Source
This commit is contained in:
Peter Jones 2011-08-11 10:48:06 -04:00
parent 77ce7d7d71
commit 0479b733c5
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu-efi.spec
View File

@ -1,7 +1,7 @@
Summary: Development Libraries and headers for EFI Summary: Development Libraries and headers for EFI
Name: gnu-efi Name: gnu-efi
Version: 3.0e Version: 3.0e
Release: 14%{?dist} Release: 15%{?dist}
Group: Development/System Group: Development/System
License: GPLv2+ License: GPLv2+
URL: ftp://ftp.hpl.hp.com/pub/linux-ia64 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 %attr(0644,root,root) /boot/efi/EFI/redhat/*.efi
%changelog %changelog
<<<<<<< HEAD * Thu Aug 11 2011 Peter Jones <pjones@redhat.com> - 3.0e-15
* Thu Aug 11 2011 Peter Jones <pjones@redhat.com> - 3.0e-14
- Correctly pad the stack when doing uefi calls - Correctly pad the stack when doing uefi calls
Related: rhbz#677468 Related: rhbz#677468
- Add ability to write UEFI callbacks and drivers - Add ability to write UEFI callbacks and drivers
- Add test harness for ABI Calling Conventions - Add test harness for ABI Calling Conventions
=======
* Thu Jun 16 2011 Peter Jones <pjones@redhat.com> - 3.0e-14 * Thu Jun 16 2011 Peter Jones <pjones@redhat.com> - 3.0e-14
- Handle uninitialized GOP driver gracefully. - Handle uninitialized GOP driver gracefully.
>>>>>>> b38a657b7181bc66628b4814d2643f8a4da8192b
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0e-13 * 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 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild