]> git.sesse.net Git - ffmpeg/commit
Merge commit 'faa8ffda2c513573733624784f0a7d0a4959d33e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Feb 2015 10:51:25 +0000 (11:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 13 Feb 2015 10:54:38 +0000 (11:54 +0100)
commitc74b3983f99a2a177904bd0b997528c1185e1231
tree7c7a50d8b61497edbc6c1f542775af4bfcd6e5ab
parent8bb489fab54ae303c687462c54d990d4b43e74a9
parentfaa8ffda2c513573733624784f0a7d0a4959d33e
Merge commit 'faa8ffda2c513573733624784f0a7d0a4959d33e'

* commit 'faa8ffda2c513573733624784f0a7d0a4959d33e':
  doc/APIchanges: fill in missing dates and hashes

Conflicts:
doc/APIchanges

See: c651a1aaecb5cb7bb40cf40df27f5273e8bcd245
See: 8c8ee17e8d2800144116ec52f26a435a06b49420 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges