Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates. ... Conflicts have been resolved in: pkgs/tools/misc/file/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/python-packages.nix		2012-11-21 16:20:36 +01:00
..
default.nix	Merge branch 'master' into stdenv-updates.	2012-11-21 16:20:36 +01:00
python.patch	Added i3wm. Added newer version of file. (this time tested, I screwed up a patch by garbas)	2012-04-30 14:34:57 +00:00