]> git.sesse.net Git - ffmpeg/commit
Merge commit '8558595a59913a4667f57d5a4658b1340f1a4354'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Dec 2013 11:48:16 +0000 (12:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Dec 2013 12:00:21 +0000 (13:00 +0100)
commit3b6e8634c3be16f6a34d9679d0d641e817f0944d
tree0dd847cfc501cb32a0c96e3a272e6e55fab0cd3d
parenta165964f3c4b48041b8f053813761490d57c6222
parent8558595a59913a4667f57d5a4658b1340f1a4354
Merge commit '8558595a59913a4667f57d5a4658b1340f1a4354'

* commit '8558595a59913a4667f57d5a4658b1340f1a4354':
  configure: Express atomics/thread deps through the dependency system

Conflicts:
configure

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