]> git.sesse.net Git - ffmpeg/commit
Merge commit '5c2a01f064d5ab2b309d25c7f46c6c4471838d90'
authorJames Almer <jamrial@gmail.com>
Thu, 16 Nov 2017 16:10:49 +0000 (13:10 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 16 Nov 2017 16:10:49 +0000 (13:10 -0300)
commitc7812b3bcffaa3fddd141cfa59a41af589766b01
tree37d66dd5904fd486082dc73503b6eea6487a4e14
parentff8f40a63092b184d7fe4416660adbba8d90849d
parent5c2a01f064d5ab2b309d25c7f46c6c4471838d90
Merge commit '5c2a01f064d5ab2b309d25c7f46c6c4471838d90'

* commit '5c2a01f064d5ab2b309d25c7f46c6c4471838d90':
  Makefile: fix distclean target
  configure: fix writing library dependencies to config.sh

This commit is a noop, see
d9ff1e4c8bdf97cbb1ab4bd97102eefbe8ebf95a
e7e7d56a850d34d710c45463607abac846972f57

Merged-by: James Almer <jamrial@gmail.com>