Vladimír Čunát 17ae1617dc Merge branch 'master' into x-updates ... Conflicts (systemd version is split on x-updates): pkgs/os-specific/linux/systemd/default.nix		2013-04-13 12:21:31 +02:00
..
audio	Remove the "proprietary" license	2013-04-12 14:37:50 +02:00
display-managers	lightdm: Add lightdm and lightdm-gtk-greeter	2013-03-29 15:37:28 +01:00
editors	Merge branch 'master' into x-updates	2013-04-13 12:21:31 +02:00
graphics	Merge branch 'master' into x-updates	2013-04-11 23:31:33 +02:00
misc	Merge branch 'master' into x-updates	2013-04-11 23:31:33 +02:00
networking	chromium: Update all channels to latest versions.	2013-04-13 10:31:36 +02:00
office	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
science	Merge branch 'master' into x-updates	2013-04-04 21:43:40 +02:00
search/recoll	Fix tarball	2013-04-05 06:59:16 -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-04-13 12:21:31 +02:00
video	vlc: upgrade to 2.0.6	2013-04-12 11:40:33 +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