diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 10:45:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-30 10:49:43 +0200 |
| commit | 3a0e21f037c082e431eff62c47203cf4d77c88cb (patch) | |
| tree | 1a0fe50d1875aa4cdf353e5c5919eac94ec7ad1d /arch.mak | |
| parent | f7a267affe8066e0b587e8ea477f437728f31fc7 (diff) | |
| parent | 186599ffe0a94d587434e5e46e190e038357ed99 (diff) | |
| download | ffmpeg-3a0e21f037c082e431eff62c47203cf4d77c88cb.tar.gz | |
Merge commit '186599ffe0a94d587434e5e46e190e038357ed99'
* commit '186599ffe0a94d587434e5e46e190e038357ed99':
build: cosmetics: Place unconditional before conditional OBJS lines
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'arch.mak')
0 files changed, 0 insertions, 0 deletions