Author: kwizart Update of /cvs/free/rpms/ffmpeg2dirac/F-17 In directory se02.es.rpmfusion.net:/tmp/cvs-serv32051/F-17 Modified Files: ffmpeg2dirac.spec Log Message: Fix commit conflict Index: ffmpeg2dirac.spec =================================================================== RCS file: /cvs/free/rpms/ffmpeg2dirac/F-17/ffmpeg2dirac.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ffmpeg2dirac.spec 2 Mar 2012 14:40:19 -0000 1.6 +++ ffmpeg2dirac.spec 2 Mar 2012 15:19:04 -0000 1.7 @@ -65,25 +65,19 @@ %changelog -* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; +* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.2.0-4 - Rebuilt for c++ ABI breakage -* Tue Feb 28 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; +* Tue Feb 28 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.2.0-3 - Rebuilt for x264/FFmpeg -* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; +* Wed Feb 08 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild -<<<<<<< ffmpeg2dirac.spec * Sat Sep 03 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.2.0-1 - Update to 0.2.0 - -======= -* Thu Sep 22 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.2.0-1 -- Update to 0.2.0 - Add Patch for FFmpeg-0.8 ->>>>>>> 1.3 * Fri Oct 16 2009 kwizart <kwizart at gmail.com> - 0.1.0-4 - Rebuild for F-12