Vladimír Čunát 644c9eb6f7 Revert "Merge #3054: add kde 4.13.2" ... This is due to breaking evaluation; see the PR discussion. This reverts commit 6a77d5fd3e, reversing changes made to 07a09fbe63. Conflicts: nixos/modules/services/x11/desktop-managers/default.nix		2014-07-22 17:48:14 +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
desktops	Revert "Merge #3054: add kde 4.13.2"	2014-07-22 17:48:14 +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
test
tools	asciidoc: add enableExtraPlugins expression argument	2014-07-20 23:03:27 +02:00
top-level	Revert "Merge #3054: add kde 4.13.2"	2014-07-22 17:48:14 +02:00