merge with tip
authorpravin@inf.ethz.ch <pravin@inf.ethz.ch>
Thu, 31 Oct 2013 03:41:46 +0000 (04:41 +0100)
committerpravin@inf.ethz.ch <pravin@inf.ethz.ch>
Thu, 31 Oct 2013 03:41:46 +0000 (04:41 +0100)
1  2 
errors/errno.fugu
hake/RuleDefs.hs
hake/symbolic_targets.mk
if/Hakefile
lib/barrelfish/terminal.c
usr/kaluga/driver_startup.c

index 108b96e,062baf0..34c6bde
mode 100755,100644..100755
Simple merge
Simple merge
diff --cc if/Hakefile
Simple merge
Simple merge
Simple merge