Merge commit '4f8cf0dc4ef6110174056df7edd9dc2f2a988b6d'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 22:34:53 +0000 (00:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 22:34:53 +0000 (00:34 +0200)
commita91c5ed008740fabdb910a59db9e5792b6574486
treee17d40f6fd498bddb8f63cf169991cd44a917fb6
parent621d4089a4cff0066d5cfc006cf20d99414ee9f9
parent4f8cf0dc4ef6110174056df7edd9dc2f2a988b6d
Merge commit '4f8cf0dc4ef6110174056df7edd9dc2f2a988b6d'

* commit '4f8cf0dc4ef6110174056df7edd9dc2f2a988b6d':
  x86: build: Restore ordering of OBJS lines

Conflicts:
libavcodec/x86/Makefile

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