Merge commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Aug 2013 07:22:24 +0000 (09:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Aug 2013 07:22:30 +0000 (09:22 +0200)
commitfa5410f61a75393d8019200ea8ef6a293ab050a1
tree6c29faa736ee943a7c42c093f5c815025f714e1c
parenta8e963835a43e64311751b01f44707bd0e360d46
parent79be2c325c5ee8f7ac9e28399e51986ebe99bb3c
Merge commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c'

* commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c':
  doc/print_options: Move options headers to a saner place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/print_options.c