fixed merging conflicts

This commit is contained in:
Honza Horák 2012-01-27 13:20:35 +01:00
commit a1f7d2b4ae

View File

@ -1,7 +1,7 @@
Summary: Linux UDF Filesystem userspace utilities
Name: udftools
Version: 1.0.0b3
Release: 14%{?dist}
Release: 15%{?dist}
License: GPLv2+
Group: Applications/Archiving
URL: http://sourceforge.net/projects/linux-udf/
@ -58,11 +58,14 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%changelog
* Thu Jan 26 2012 Honza Horak <hhorak@redhat.com> - 1.0.0b3-14
* Thu Jan 26 2012 Honza Horak <hhorak@redhat.com> - 1.0.0b3-15
- fixed segmentation fault
Resolves: #685005
- fixed some most obvious issues from static analysis
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0b3-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0b3-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild