Lluís Batlle i Rossell 3b26ba7019 Merge remote-tracking branch 'central/master' into stdenv-updates ... Conflicts: pkgs/os-specific/linux/alsa-utils/default.nix		2013-01-27 11:32:12 +01:00
..
audio	Merge branch 'master' into stdenv-updates.	2013-01-11 15:46:10 +01:00
display-managers/slim	consolekit: Remove	2012-12-13 11:30:18 +01:00
editors	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-01-17 14:19:14 +01:00
graphics	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-01-22 23:23:53 +01:00
misc	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-01-22 23:23:53 +01:00
networking	Merge remote-tracking branch 'central/master' into stdenv-updates	2013-01-27 11:32:12 +01:00
office	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
science	Merge remote-tracking branch 'upstream/master' into stdenv-updates	2013-01-20 16:53:21 +01:00
taxes	* It's that time of year again.	2012-03-10 19:23:04 +00:00
version-management	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-01-17 14:19:14 +01:00
video	xbmc: Add libvdpau to LD_LIBRARY_PATH, so xbmc can find it at runtime	2013-01-21 19:05:08 +01:00
virtualization	Merge branch 'master' into stdenv-updates.	2013-01-11 15:46:10 +01:00
window-managers	haskell-xmonad-extras: update to version 0.11	2013-01-09 16:54:29 +01:00