Merge commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 25 Apr 2013 07:54:11 +0000 (09:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 25 Apr 2013 07:54:11 +0000 (09:54 +0200)
commit575399c7e11611b4cbf30a61e0e8e92f12893896
tree9eda22086dc72804fc573a85b3ead4f19033be88
parentaa96439fae67d8cefa2376d60f9a0e29b234ceaa
parentfc18cc44ebfae07da153dc782572e7ce2f6fe47d
Merge commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d'

* commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d':
  fate: add CVFC1_Sony_C to h264 conformance tests
  doc/APIchanges: add missing hashes and dates

Conflicts:
doc/APIchanges
tests/fate/h264.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
tests/fate/h264.mak