Merge remote-tracking branch 'upstream/master' into sockeye
authorDaniel Schwyn <schwyda@student.ethz.ch>
Mon, 24 Jul 2017 08:27:44 +0000 (10:27 +0200)
committerDaniel Schwyn <schwyda@student.ethz.ch>
Mon, 24 Jul 2017 08:27:58 +0000 (10:27 +0200)
commitd096b5536399c8b7c726c372c9e904615cf7455c
tree7d9dd40bfbe8ce07dae21ed290ea88cffa3440e0
parentc67fec05454db58b4e4982f0e60376d5051131b9
parent52998f567683c9b906f1162184da5e530c16cc56
Merge remote-tracking branch 'upstream/master' into sockeye

Signed-off-by: Daniel Schwyn <schwyda@student.ethz.ch>
hake/RuleDefs.hs
usr/skb/Hakefile