[FFmpeg-cvslog] Merge commit '2e06758479650f6e2a8820c7105f2d193a701175' into release/1.1

[Michael Niedermayer]

On Sun, May 12, 2013 at 12:23:08PM +0200, Reimar Döffinger wrote:
> On Sun, May 12, 2013 at 12:13:36PM +0200, Michael Niedermayer wrote:
> > ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun May 12 12:02:26 2013 +0200| [50a3442120e685963649417a6455ce90cf45b653] | committer: Michael Niedermayer
> > 
> > Merge commit '2e06758479650f6e2a8820c7105f2d193a701175' into release/1.1
> > 
> > * commit '2e06758479650f6e2a8820c7105f2d193a701175':
> >   Prepare for 9.5 Release
> >   update Changelog
> >   add missed CVE reference in 9.2 release
> >   fate: fetch samples that match the release series
> > 
> > Conflicts:
> > 	Changelog
> > 	RELEASE
> > 	tests/Makefile
> > 
> > The rsync change is not merged
> > We need to maintain the ability to checkout and test old revissions
> > from master. This implies that the default sample repository has the
> > needed samples for both older and newer revissions. Thus there is no
> > need for a seperate one for each release.
> > Comments & Suggestions of course welcome
> 
> Which tests are affected anyway?

I think there was 1 or 2 files related to some timestamp handling
difference,

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Everything should be made as simple as possible, but not simpler.
-- Albert Einstein
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-cvslog/attachments/20130512/c5df0ccf/attachment.asc>