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
2014-07-03 12:37:40 +02:00
2014-07-12 13:18:46 +02:00
2014-07-21 12:05:57 +02:00
2014-07-21 12:05:57 +02:00
2014-04-23 08:02:18 -04:00
S
Description
No description provided
Readme
5 GiB
Languages
Nix 95%
Shell 2%
Python 1.8%
Rust 0.3%
JavaScript 0.2%
Other 0.4%