git.barrelfish.org Git - barrelfish/commit

projects / barrelfish / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b35d7aa ea723c9)

author	pravin@inf.ethz.ch <pravin@inf.ethz.ch>
	Thu, 6 Jun 2013 07:56:12 +0000 (09:56 +0200)
committer	pravin@inf.ethz.ch <pravin@inf.ethz.ch>
	Thu, 6 Jun 2013 07:56:12 +0000 (09:56 +0200)
commit	46cf8b349915e8c128932c3f701fd4b6ca569610
tree	b6c2189009fa2ac24f5720ce7b713133a84449bf	tree \| snapshot
parent	b35d7aa6da285fa41809a2895f67c295d02120bc	commit \| diff
parent	ea723c95c1f9cb7176c754ca7248d731339f00d5	commit \| diff

merged

19 files changed:

errors/errno.fugu	diff1 \|	diff2 \|	blob \| history
hake/Main.hs	diff1 \|	diff2 \|	blob \| history
hake/RuleDefs.hs	diff1 \|	diff2 \|	blob \| history
hake/symbolic_targets.mk	diff1 \|	diff2 \|	blob \| history
if/Hakefile	diff1 \|	diff2 \|	blob \| history
include/barrelfish/spawn_client.h	diff1 \|	diff2 \|	blob \| history
include/bench/bench.h	diff1 \|	diff2 \|	blob \| history
include/contmng/contmng.h	diff1 \|	diff2 \|	blob \| history
include/trace/trace.h	diff1 \|	diff2 \|	blob \| history
kernel/arch/x86_64/irq.c	diff1 \|	diff2 \|	blob \| history
lib/barrelfish/spawn_client.c	diff1 \|	diff2 \|	blob \| history
lib/lwip/src/barrelfish/idc_barrelfish.c	diff1 \|	diff2 \|	blob \| history
lib/net_queue_manager/net_soft_filters_srv_impl.c	diff1 \|	diff2 \|	blob \| history
lib/net_queue_manager/queue_manager.c	diff1 \|	diff2 \|	blob \| history
usr/bfscope/Hakefile	diff1 \|	diff2 \|	blob \| history
usr/drivers/e1000/e1000n.c	diff1 \|	diff2 \|	blob \| history
usr/drivers/e1000/e1000n_debug.h	diff1 \|	diff2 \|	blob \| history
usr/echoserver/tcpechoserver.c	diff1 \|	diff2 \|	blob \| history
usr/vmkitmon/guest.c	diff1 \|	diff2 \|	blob \| history

Barrelfish OS git repo