[FFmpeg-devel] FFmpeg 1.2.3, 0.11.4

[Michael Niedermayer]

On Wed, Aug 28, 2013 at 09:38:18AM -0700, Timothy Gu wrote:
> On Aug 26, 2013 6:37 PM, "Michael Niedermayer" <michaelni at gmx.at> wrote:
> > git is not cvs
> >
> > theres not one HEAD of release/1.1 that you need to work with.
> > you only need to coordinate your work with others who work on the
> > same thing, like docs cleanup in this case. But beyond that you could
> > even base your work on the last release from 1.1
> > and send a pull request via email, no github needed either
> > or base it on master release/1.1 HEAD
> > Iam not using github to merge them anyway
> 
> Please merge from GitHub/TimothyGu/release/(1.0|1.1).

merged

thanks

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

In a rich man's house there is no place to spit but his face.
-- Diogenes of Sinope
-------------- 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-devel/attachments/20130829/bb6a0b62/attachment.asc>