Eelco Dolstra f32979e2d8 Revert "cups: Drop unused dependencies and add libusb1 dependency" ... This reverts commit 6f700142c4.		2012-10-08 14:43:42 -04:00
..
applications	Merge remote-tracking branch 'origin/master' into x-updates	2012-10-08 13:48:30 -04:00
build-support
data
desktops
development	gtk+: Update to 3.2.4	2012-10-08 14:20:30 -04:00
games
lib	Add a function ‘getVersion’ to get the version of a derivation	2012-10-05 13:48:57 -04:00
misc	Revert "cups: Drop unused dependencies and add libusb1 dependency"	2012-10-08 14:43:42 -04:00
os-specific	Merge remote-tracking branch 'origin/master' into x-updates	2012-10-08 13:48:30 -04:00
servers	Merge remote-tracking branch 'origin/master' into x-updates	2012-10-08 13:48:30 -04:00
shells
stdenv
test
tools	Merge remote-tracking branch 'origin/master' into x-updates	2012-10-08 13:48:30 -04:00
top-level	Merge remote-tracking branch 'origin/master' into x-updates	2012-10-08 13:48:30 -04:00