]> git.sesse.net Git - ffmpeg/commit
Merge commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 18:36:59 +0000 (19:36 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 17 Apr 2016 18:36:59 +0000 (19:36 +0100)
commitb0c75963c87defa2c31661af23860854dfe15b4c
tree6b468b64724ccaf37eaa885b1b5b178dea08a5ff
parent9d4799c247e305ab480198e4942d229a2949ea9b
parent48362ceadeb2eb5286ae94ef7f9542d990ff7ec7
Merge commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7'

* commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7':
  doc: Update paths to match new examples location

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
.gitignore
doc/build_system.txt