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
..
applications	Merge remote-tracking branch 'origin/master' into x-updates	2012-09-26 14:51:51 -04:00
build-support	Merge remote-tracking branch 'origin/master' into x-updates	2012-09-26 14:51:51 -04:00
data	Merge remote-tracking branch 'origin/master' into x-updates	2012-09-26 14:51:51 -04:00
desktops	Enable the aspell plugin for KDE 4.7 (the default kde4).	2012-09-24 16:26:46 +02:00
development	Merge remote-tracking branch 'origin/master' into x-updates	2012-09-26 14:51:51 -04:00
games	games/warsow: Updated to 1.0.	2012-09-24 02:27:34 +04:00
lib	Adding a function capable of extracting the name with version out of url/file path	2012-09-13 13:59:23 +04:00
misc
os-specific	Merge remote-tracking branch 'origin/master' into x-updates	2012-09-26 14:51:51 -04:00
servers	Merge remote-tracking branch 'origin/master' into x-updates	2012-09-26 14:51:51 -04:00
shells
stdenv
test
tools	Merge remote-tracking branch 'origin/master' into x-updates	2012-09-26 14:51:51 -04:00
top-level	Merge remote-tracking branch 'origin/master' into x-updates	2012-09-26 14:51:51 -04:00