Vladimír Čunát eb2e46aab2 Merge branch 'master' into x-updates ... Conflicts: pkgs/applications/graphics/rawtherapee/default.nix pkgs/applications/misc/blender/default.nix pkgs/applications/networking/browsers/chromium/sources.nix pkgs/os-specific/linux/kernel/linux-3.9.nix pkgs/top-level/all-packages.nix		2013-04-04 21:43:40 +02:00
..
audio	gmpc 11.8.16: New package, a GTK MPD (Music Player Daemon) client	2013-04-04 17:42:17 +02:00
display-managers	lightdm: Add lightdm and lightdm-gtk-greeter	2013-03-29 15:37:28 +01:00
editors	Merge pull request #407 from maggesi/proofgeneral_updates	2013-03-25 03:33:21 -07:00
graphics	Merge branch 'master' into x-updates	2013-04-04 21:43:40 +02:00
misc	Merge branch 'master' into x-updates	2013-04-04 21:43:40 +02:00
networking	Merge branch 'master' into dropbox-py	2013-04-04 00:18:48 +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 recoll filters, enable inotify support.	2013-04-01 22:59:22 -07:00
taxes	add dutch tax application for 2012	2013-03-22 00:00:04 +01:00
version-management	Merge branch 'master' into x-updates	2013-04-04 21:43:40 +02:00
video	xbmc: add pulse support, lame, avahi, libdvdcss	2013-04-01 17:13:00 +02:00
virtualization	Partially revert my recent kernelPackages changes	2013-03-24 07:45:00 -04:00
window-managers	Merge branch 'master' into x-updates	2013-04-04 21:43:40 +02:00