Vladimír Čunát c72ed04892 Merge 'master' and 'stdenv-fixes' into x-updates ... Final stabilization phase before merging into master. Conflicts (glibc-2.13): pkgs/top-level/all-packages.nix		2013-06-16 10:13:51 +02:00
..
audio	flac: update, enable tests	2013-06-11 15:48:42 +02:00
display-managers	lightdm: Add lightdm and lightdm-gtk-greeter	2013-03-29 15:37:28 +01:00
editors	Merge 'master' and 'stdenv-fixes' into x-updates	2013-06-16 10:13:51 +02:00
graphics	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
misc	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
networking	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-15 17:15:32 +04:00
office	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-15 17:15:32 +04:00
science	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-15 17:15:32 +04: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 remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
video	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
virtualization	virtualbox+guest: Update to new upstream v4.2.12.	2013-04-13 10:31:36 +02:00
window-managers	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00