Rickard Nilsson db292a74c0 Merge remote-tracking branch 'upstream/master' into systemd ... Conflicts: pkgs/tools/networking/network-manager/default.nix		2013-01-03 13:44:47 +01:00
..
audio	audacity: update to 2.0.2	2012-12-13 08:04:49 +01:00
display-managers/slim	consolekit: Remove	2012-12-13 11:30:18 +01:00
editors	vbindiff: New package, version 3.0_beta4.	2012-12-12 12:36:18 +01:00
graphics	darktable: Update to 1.1.1	2012-12-17 17:27:13 +01:00
misc	Merge remote-tracking branch 'upstream/master' into systemd	2013-01-03 13:44:47 +01:00
networking	Added FileZilla-3.6.0.2.	2012-12-31 11:59:08 +01:00
office	abiword: Enable parallel building.	2012-12-12 12:36:17 +01:00
science	Added Logisim-2.7.1.	2012-12-27 16:25:39 +01:00
taxes	* It's that time of year again.	2012-03-10 19:23:04 +00:00
version-management	git-annex: update to version 3.20121211	2012-12-15 11:44:13 +01:00
video	mkvtoolnix: upgrade to 5.9.0	2012-12-13 14:00:28 +01:00
virtualization	Add mount.vboxsf back to the expression, add dbus & patchelf everything so it works	2012-12-30 16:04:48 -10:00
window-managers	Merge pull request #221 from Eelis/master	2012-12-27 05:31:22 -08:00