Vladimír Čunát a2c316288c Merge master into stdenv-updates ... Conflicts: pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved) pkgs/top-level/all-packages.nix (trivial)		2014-01-12 12:29:24 +01:00
..
bindings
desktop	Add gnome3.nautilus and remove gnome2.nautilus (didn't compile)	2014-01-10 01:45:34 +01:00
platform	Merge master into x-updates	2013-12-18 23:21:29 +01:00
default.nix	Merge master into stdenv-updates	2014-01-12 12:29:24 +01:00