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
..
audio	Adding opus-tools.	2012-09-25 20:08:01 +02:00
display-managers/slim	slim: Really update to 1.3.4	2012-08-17 11:33:59 -04:00
editors	Merge remote-tracking branch 'origin/master' into x-updates	2012-09-26 14:51:51 -04:00
graphics	Merge remote-tracking branch 'origin/master' into x-updates	2012-09-26 14:51:51 -04:00
misc	Merge remote-tracking branch 'origin/master' into x-updates	2012-09-26 14:51:51 -04:00
networking	Merge remote-tracking branch 'origin/master' into x-updates	2012-09-26 14:51:51 -04:00
office	libreoffice: trying to enable parallel building	2012-09-03 15:53:07 +02:00
science	Update SSReflect to version 1.4	2012-09-10 23:15:54 +02:00
taxes	* It's that time of year again.	2012-03-10 19:23:04 +00:00
version-management	darcs: install bash completion instructions	2012-09-25 15:15:38 +02:00
video	Merge remote-tracking branch 'origin/master' into x-updates	2012-09-26 14:51:51 -04:00
virtualization	virtualbox/guest-additions: Update to 4.1.22.	2012-09-10 21:37:37 +02:00
window-managers	Merge remote-tracking branch 'origin/master' into x-updates	2012-09-26 14:51:51 -04:00