Merge commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 14:32:39 +0000 (15:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 14:32:39 +0000 (15:32 +0100)
commite9fbb9783c825250b4d06dded8ac2b712284b4e9
tree9c217ff2dd371509ac30b50faeaadde492e6e716
parentc32cc7e3a40d8449a876938655c0d8ac715b2772
parentdbd2a34ba5e5e46b6835e4425c360723c643b7a8
Merge commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8'

* commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8':
  build: cosmetics: Group hw accelerator Makefile entries together

Conflicts:
libavcodec/Makefile

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