Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801'
authorClément Bœsch <clement@stupeflix.com>
Wed, 22 Jun 2016 09:25:49 +0000 (11:25 +0200)
committerClément Bœsch <clement@stupeflix.com>
Wed, 22 Jun 2016 09:28:51 +0000 (11:28 +0200)
commit5558ff3a9f11acbf751fe46a27f5c67b04b23884
tree95909d28d70a8f50bce569de43caa8f12da689a1
parent85185578ce309f5a605ec90d97f9acf38598ccaa
parent257f00ec1ab06a2a161f535036c6512f3fc8e801
Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801'

* commit '257f00ec1ab06a2a161f535036c6512f3fc8e801':
  Split global .gitignore file into per-directory files

Merged-by: Clément Bœsch <clement@stupeflix.com>
.gitignore
doc/.gitignore
doc/examples/.gitignore
libavutil/.gitignore
tests/.gitignore
tools/.gitignore