Merge branch 'master' into hake-platforms
authorDavid Cock <david.cock@inf.ethz.ch>
Thu, 27 Aug 2015 11:24:13 +0000 (13:24 +0200)
committerDavid Cock <david.cock@inf.ethz.ch>
Thu, 27 Aug 2015 11:24:13 +0000 (13:24 +0200)
commit47f02e5ca192ebf37a5cac4aa4fa390d3c3b0f93
tree464f9e4d2d73b5459c8db2ebf537c88d20becf70
parent25c86757f698a851ee536e3a0e5dc6508c773141
parenta699702feb2eaf75db63154057a3ad09ac7e017e
Merge branch 'master' into hake-platforms

Signed-off-by: David Cock <david.cock@inf.ethz.ch>

Conflicts:
hake/Args.hs
hake/Main.hs
hake/RuleDefs.hs
hake/Args.hs
hake/Config.hs.ubuntu
hake/RuleDefs.hs
hake/X86_32.hs
hake/symbolic_targets.mk
kernel/Hakefile