[FFmpeg-cvslog] Merge commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c'

Michael Niedermayer git at videolan.org
Sun Sep 1 14:00:30 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Sep  1 13:41:33 2013 +0200| [d8809b357c5ee3a760262b17bc7f97ecb876cb96] | committer: Michael Niedermayer

Merge commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c'

* commit 'f4ca970dba13a60a1334cce1b574036e6f624b9c':
  configure: Add docdir configuration option

Conflicts:
	configure
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d8809b357c5ee3a760262b17bc7f97ecb876cb96
---





More information about the ffmpeg-cvslog mailing list