Merge commit '4be292dac7e7f0586053fcced8d530ccf4ebef29'

Browse Source

* commit '4be292dac7e7f0586053fcced8d530ccf4ebef29':
  atrac: Move doxygen comments to the header

Conflicts:
	libavcodec/atrac.c
	libavcodec/atrac.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

pull/37/merge

Michael Niedermayer 11 years ago

parent c2df95978b 4be292dac7

commit 16bb8faac6

2 changed files with 2 additions and 2 deletions

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Unified View

Diff Options

Show Stats Download Patch File Download Diff File

Write Preview

Loading…

Cancel

Save