Merge commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Dec 2013 19:17:36 +0000 (20:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 2 Dec 2013 19:17:36 +0000 (20:17 +0100)
commit6f9be8120d2933268733eded5d6c0eb92341e788
treef4175a0875818c6ad0bad6f78456205e3780bd59
parenta6c455cf6bb239280cae19e0eb94fa453ced2db7
parent5a9fcc7d2524d6c0f86b2855019ee9f4cf360276
Merge commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276'

* commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276':
  build: Add rule for building host-specific object files

Conflicts:
Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
common.mak