Eelco Dolstra c6c1bc6b0f Merge branch 'master' into systemd		2013-01-07 00:34:25 +01:00
..
applications	Merge branch 'master' into systemd	2013-01-07 00:34:25 +01:00
build-support	More specific tracing of a relatively tricky replace once; account for default.nix being present everywhere.	2012-12-22 14:14:48 +04:00
data	linux man-pages: updating to 3.45	2013-01-04 10:28:34 +01:00
desktops	Merge remote-tracking branch 'origin/master' into systemd	2012-12-10 12:39:14 +01:00
development	Merge branch 'master' into systemd	2013-01-07 00:34:25 +01:00
games	anki: add version 2.0.3	2013-01-04 03:48:47 +00:00
lib	Simplify lib.typeOf	2012-12-31 13:59:30 -05:00
misc	Wine: Update to 1.5.21	2013-01-07 01:35:58 +04:00
os-specific	Merge branch 'master' into systemd	2013-01-07 00:34:25 +01:00
servers	samba, imagemagick: Add missing meta info	2013-01-06 22:31:16 +01:00
shells	bash-completion: remove NixOS-specific patch	2012-10-16 18:26:02 +02:00
stdenv	Remove support for the obsolete powerpc-darwin and i686-darwin platforms	2012-11-29 14:10:49 +01:00
test
tools	Merge branch 'master' into systemd	2013-01-07 00:34:25 +01:00
top-level	Merge branch 'master' into systemd	2013-01-07 00:34:25 +01:00