Merge commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 01:39:46 +0000 (02:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 01:39:46 +0000 (02:39 +0100)
commitb752d02f42bbefdf8b198f03f166cc98bffcc8e8
treedcf50766b1716539dd87460204811ab4609ae2e1
parent03fd80dcb1f8885385bcd04aa59a2931db5316d3
parent78b21c1d7177e1d61ad3c9225f67699da089aa7c
Merge commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c'

* commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c':
  http: Drop doxy comments

Conflicts:
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/http.c