Merge branch 'master' into device-queue
authorRoni Häcki <roni.haecki@inf.ethz.ch>
Thu, 11 Aug 2016 09:18:31 +0000 (11:18 +0200)
committerRoni Häcki <roni.haecki@inf.ethz.ch>
Thu, 11 Aug 2016 09:18:31 +0000 (11:18 +0200)
commit839a8c48f927a124fbda3df4f6e22b9c45f5f03d
treec9b01b92a75e573bc3a30a565d4c00b49f02ea55
parent37ef0f28ffd42f218f71faf602ed2cdfea18f0c5
parentede02283bb26273461853d4b190e70452ffe1040
Merge branch 'master' into device-queue
hake/Config.hs.template
hake/K1om.hs
hake/RuleDefs.hs
hake/Tools.hs
hake/X86_32.hs
tools/harness/tests/common.py