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
..
darwin	darwin x11/opengl: only copy subset of files (close #1165)	2013-11-07 10:39:28 +01:00
gnu
linux	Merge master into stdenv-updates	2014-01-12 12:29:24 +01:00
windows