Merge commit '40020e171a3549a2c0b65ce6f2649aec868872f2'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 09:17:52 +0000 (11:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 09:17:52 +0000 (11:17 +0200)
commit97200d89b9fccef1b72ea0e0e1d8eff7a5e05f43
treef393666a8f51e7533c38e91169527f837f5e8e2c
parent0718f0cc24bc8413cd0cf44fcf000f0e52a67522
parent40020e171a3549a2c0b65ce6f2649aec868872f2
Merge commit '40020e171a3549a2c0b65ce6f2649aec868872f2'

* commit '40020e171a3549a2c0b65ce6f2649aec868872f2':
  doxy: add a section about versioning.

Conflicts:
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/avutil.h