diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 00:04:50 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-12 00:22:06 +0400 |
| commit | b2175b0f2a7cfdcc784ec2eabab4f6da3b0e6979 (patch) | |
| tree | c33d11aa28730f9025b95e3c7c935def76fa29a3 /configure | |
| parent | 9ab221f8d82da9e2cf1503cc5db115838d766d97 (diff) | |
| parent | 93e65e9a6c0895f869752a66731d9b2ec3916467 (diff) | |
Merge commit '93e65e9a6c0895f869752a66731d9b2ec3916467'
* commit '93e65e9a6c0895f869752a66731d9b2ec3916467':
Cosmetics, restore alphabetic order in atomics lists.
Conflicts:
libavutil/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1275,8 +1275,8 @@ THREADS_LIST=' ATOMICS_LIST=' atomics_gcc - atomics_win32 atomics_suncc + atomics_win32 ' ARCH_LIST=' |