]> git.sesse.net Git - ffmpeg/commit
Merge commit 'd6c2c2796d8885e99fc90793cdd7937826f82fab'
authorClément Bœsch <u@pkh.me>
Sat, 9 Jul 2016 12:46:18 +0000 (14:46 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 9 Jul 2016 12:48:24 +0000 (14:48 +0200)
commit3536493082be8a4837a2a6aaeecb07ad190beefb
treeea4b7bed58e0253f2054decc9577f5b5b0f1d99b
parenta7ce5b25c03abef6f3a2349b76343904513c46b3
parentd6c2c2796d8885e99fc90793cdd7937826f82fab
Merge commit 'd6c2c2796d8885e99fc90793cdd7937826f82fab'

* commit 'd6c2c2796d8885e99fc90793cdd7937826f82fab':
  LICENSE: Fix silly typo

This commit is a noop, the typo disappeared when the whole paragraph was
reworked in 484aec4da3f729fca9d9f84a6b895a8f882554db.

Merged-by: Clément Bœsch <u@pkh.me>