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
..
admin	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
archivers	Merge remote-tracking branch 'origin/master' into stdenv-updates	2012-12-04 17:12:35 +01:00
backup	Merge branch 'master' into stdenv-updates.	2013-01-11 15:46:10 +01:00
bluetooth	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
cd-dvd
compression
filesystems	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-17 14:19:14 +01:00
misc	Merge remote-tracking branch 'central/master' into stdenv-updates	2013-01-27 11:32:12 +01:00
networking	Merge remote-tracking branch 'central/master' into stdenv-updates	2013-01-27 11:32:12 +01:00
package-management	Merge remote-tracking branch 'central/master' into stdenv-updates	2013-01-27 11:32:12 +01:00
security	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-01-22 23:23:53 +01:00
system	logrotate: Update to 3.8.3	2013-01-15 18:53:12 +01:00
text	gawk: update to 4.0.2	2013-01-04 20:39:54 +01:00
typesetting
video
virtualization	ec2-ami-tools: Update to 1.4.0.9	2013-01-24 18:23:04 +01:00
X11	Merge remote-tracking branch 'eelco/master' into stdenv-updates	2012-12-28 23:28:16 +01:00