diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 14:32:55 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 14:32:55 +0100 |
commit | 2fc662ae63ab79234f7c2996ad4e5c1993f85a18 (patch) | |
tree | 1d4d3299b037c1b12046ec68a41926da8412deea /doc | |
parent | 5ecf8189c682f41ab315e171e0e7721d7e272138 (diff) | |
parent | 040c565e51985477a8fa5e42d2ddfb26ebde6608 (diff) | |
download | ffmpeg-2fc662ae63ab79234f7c2996ad4e5c1993f85a18.tar.gz |
Merge commit '040c565e51985477a8fa5e42d2ddfb26ebde6608'
* commit '040c565e51985477a8fa5e42d2ddfb26ebde6608':
doc: developer: Allow tabs in the vim configuration for Automake files
Remove pointless av_cold attributes in header files
Conflicts:
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/developer.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/developer.texi b/doc/developer.texi index 5acdce9643..fe4b40ac4a 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -203,7 +203,7 @@ set softtabstop=4 set cindent set cinoptions=(0 " Allow tabs in Makefiles. -autocmd FileType make set noexpandtab shiftwidth=8 softtabstop=8 +autocmd FileType make,automake set noexpandtab shiftwidth=8 softtabstop=8 " Trailing whitespace and tabs are forbidden, so highlight them. highlight ForbiddenWhitespace ctermbg=red guibg=red match ForbiddenWhitespace /\s\+$\|\t/ |