Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Mar 2013 11:12:31 +0000 (12:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Mar 2013 11:12:38 +0000 (12:12 +0100)
* commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975':
  ape: use correct context for the bit table printed in debug
  build: Move setting of SRC_DIR to the only place it is used

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

diff --cc common.mak
Simple merge
diff --cc library.mak
Simple merge