Eelco Dolstra 8e9e4b05f7 Fix running preHook ... Accidentally (?) lost in e3875297fa.		2014-11-06 11:26:09 +01:00
..
applications	Merge remote-tracking branch 'origin/master' into staging	2014-11-06 10:16:39 +01:00
build-support	nixBuild: Respect the preHook/postHook of the caller	2014-11-06 11:12:29 +01:00
data	Revert "Update Liberation fonts"	2014-11-06 10:03:42 +01:00
desktops	Merge recent master into staging	2014-11-05 15:00:44 +01:00
development	mesa: Don't depend on Wayland	2014-11-06 11:02:02 +01:00
games	Merge remote-tracking branch 'origin/master' into staging	2014-11-06 10:16:39 +01:00
misc	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
os-specific	Merge remote-tracking branch 'origin/master' into staging	2014-11-06 10:16:39 +01:00
servers	Merge remote-tracking branch 'origin/master' into staging	2014-11-06 10:16:39 +01:00
shells	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
stdenv	Fix running preHook	2014-11-06 11:26:09 +01:00
test	Merge recent master into staging	2014-09-13 21:48:29 +02:00
tools	Merge remote-tracking branch 'origin/master' into staging	2014-11-06 10:16:39 +01:00
top-level	Merge remote-tracking branch 'origin/master' into staging	2014-11-06 10:16:39 +01:00