Vladimír Čunát bde20f3e88 Merge branch 'master' into x-updates ... Conflicts (just taken x-updates): pkgs/servers/x11/xorg/overrides.nix		2013-04-24 06:29:09 +00:00
..
audio	Distrho: fix build: pin premake to version 3	2013-04-22 23:40:06 +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-24 06:29:09 +00: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-24 06:29:09 +00:00
networking	Merge branch 'master' into x-updates	2013-04-24 06:29:09 +00:00
office	Merge branch 'master' into x-updates	2013-04-24 06:29:09 +00:00
science	Merge branch 'master' into x-updates	2013-04-24 06:29:09 +00: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-04-24 06:29:09 +00:00
video	gnash: fix build via using pangox_compat	2013-04-18 11:28:03 +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