Merge branch 'f17' into f16

Merge branch 'f18' into f17
Remove f17 specific change log entry
2012-11-25 18:04:37 -06:00 · 2012-11-25 18:02:14 -06:00 · 2012-11-22 12:27:50 -06:00 · 2012-11-22 12:26:20 -06:00
1 changed files with 0 additions and 6 deletions
--- a/squashfs-tools.spec
+++ b/squashfs-tools.spec
@ -53,12 +53,6 @@ rm -rf %{buildroot}
 * Thu Nov 22 2012 Bruno Wolff III <bruno@wolff.to> - 4.2-4
 - Backported fix for bz 842458 (CVE-2012-4024)
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 * Tue Mar 01 2011 Bruno Wolff III <bruno@wolff.to> - 4.2-1
 - 4.2 is released.
 - Bugfix for bad data causing crash.
Author	SHA1	Message	Date
Bruno Wolff III	6e0f57096f	Merge branch 'f17' into f16	2012-11-25 18:04:37 -06:00
Bruno Wolff III	114dce0a91	Merge branch 'f18' into f17	2012-11-25 18:02:14 -06:00
Bruno Wolff III	42ef8948c5	Remove f17 specific change log entry	2012-11-22 12:27:50 -06:00
Bruno Wolff III	897107b6cd	Remove f18 specific change log entry	2012-11-22 12:26:20 -06:00