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)
commitc1692439e081dcc259489a1c2ddc2a659870dce6
tree8dd147f4277f59305cb82b6ca3cfbacb3dcaba8e
parentc7e6443441ed5c1b5f64067dfbf4956bc2c6acbb
parent3ae0e721c7b6e0483801b9039b3d140e3b68b7f5
Merge commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5'

* commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5':
  checkasm: Always link statically

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