Merge commit '186599ffe0a94d587434e5e46e190e038357ed99'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 May 2013 08:45:47 +0000 (10:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 May 2013 08:49:43 +0000 (10:49 +0200)
commit3a0e21f037c082e431eff62c47203cf4d77c88cb
tree1a0fe50d1875aa4cdf353e5c5919eac94ec7ad1d
parentf7a267affe8066e0b587e8ea477f437728f31fc7
parent186599ffe0a94d587434e5e46e190e038357ed99
Merge commit '186599ffe0a94d587434e5e46e190e038357ed99'

* commit '186599ffe0a94d587434e5e46e190e038357ed99':
  build: cosmetics: Place unconditional before conditional OBJS lines

Conflicts:
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/Makefile