nixpkgs/pkgs/applications/window-managers/awesome
Eelco Dolstra d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates
Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix
2012-09-26 14:51:51 -04:00
..
default.nix Merge remote-tracking branch 'origin/master' into x-updates 2012-09-26 14:51:51 -04:00