Vladimír Čunát 1278859d31 Merge branch 'master' into x-updates ... Conflicts (just splitting version from name): pkgs/os-specific/linux/systemd/default.nix		2013-05-08 13:46:46 +02:00
..
audio	mopidy: Update to 0.14.1	2013-05-06 11:27:52 +02:00
display-managers
editors	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
graphics	Merge branch 'master' into x-updates	2013-05-01 08:14:15 +02:00
misc	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
networking	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
office	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
science	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
search	Adding doodle.	2013-04-22 20:57:14 +04:00
taxes	aangifte2012: preload library which seems needed	2013-04-05 00:34:14 +02:00
version-management	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
video	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
virtualization	virtualbox+guest: Update to new upstream v4.2.12.	2013-04-13 10:31:36 +02:00
window-managers	Merge branch 'master' into x-updates	2013-04-11 23:31:33 +02:00