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)
1  2 
hake/Config.hs.template
hake/K1om.hs
hake/RuleDefs.hs
hake/Tools.hs
hake/X86_32.hs
tools/harness/tests/common.py

Simple merge
diff --cc hake/K1om.hs
Simple merge
Simple merge
diff --cc hake/Tools.hs
Simple merge
diff --cc hake/X86_32.hs
Simple merge
Simple merge