Vladimír Čunát 9b02635faa Merge recent master into x-updates ... Hydra: ?compare=1138350 Conflicts: nixos/modules/services/x11/desktop-managers/default.nix Two imports were added independently on the same line. I split it as well, as it was very long now.		2014-07-21 12:05:57 +02:00
..
applications	Merge recent master into x-updates	2014-07-21 12:05:57 +02:00
build-support	Filter out broken-completely links	2014-07-18 17:42:00 +04:00
data	tzdata: Update to 2014e	2014-07-08 18:35:40 +02:00
desktops	Merge recent master into x-updates	2014-07-21 12:05:57 +02:00
development	Merge recent master into x-updates	2014-07-21 12:05:57 +02:00
games	exult: fix build, same as 4b263946d	2014-07-18 11:56:49 +02:00
misc	my-env: Support for running command directly by load-env-xxx script	2014-07-16 23:09:49 +02:00
os-specific	Merge recent master into x-updates	2014-07-17 19:30:56 +02:00
servers	Merge recent master into x-updates	2014-07-21 12:05:57 +02:00
shells	allow zsh on mac	2014-07-17 15:38:19 -07:00
stdenv	Don't suggest using --arg config '{ allowUnfree = true; }'	2014-06-17 15:00:24 -05:00
test
tools	asciidoc: add enableExtraPlugins expression argument	2014-07-20 23:03:27 +02:00
top-level	Merge recent master into x-updates	2014-07-21 12:05:57 +02:00