Merge commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5'
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 22 Jul 2015 14:30:29 +0000 (16:30 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 22 Jul 2015 14:30:37 +0000 (16:30 +0200)
* commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5':
  checkasm: Always link statically

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
1  2 
Makefile
common.mak
tests/checkasm/Makefile

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