Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/libav/default.nix pkgs/shells/bash/bash-4.2-patches.nix pkgs/stdenv/generic/default.nix		2014-10-07 00:09:37 +02:00
..
admin
archivers	gnutar: Update to 1.28	2014-10-06 20:53:54 +02:00
audio
backup	rsnapshot: set meta.platforms	2014-10-01 22:29:33 +02:00
bluetooth
cd-dvd	vobsub2srt: update to 20140817	2014-09-20 13:28:15 -05:00
compression	xz: Update to 5.0.7	2014-10-06 20:51:51 +02:00
filesystems	btrfsProgs: update from 3.16.1 to 3.16.2	2014-10-06 21:48:24 +02:00
graphics	logstalgia: update from 1.0.3 to 1.0.5 and adopt it	2014-10-02 18:38:30 +02:00
inputmethods	fcitx: update from 4.2.8.4 to 4.2.8.5	2014-09-30 11:14:23 +01:00
misc	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
networking	dnsmasq: update from 2.71 to 2.72	2014-10-06 22:31:43 +02:00
package-management	Update nixUnstable	2014-10-04 16:11:27 -04:00
security	pcsclite: 1.8.11 -> 1.8.12	2014-10-01 13:18:55 -07:00
system	ddrescue: update from 1.18.1 to 1.19	2014-10-06 21:58:40 +02:00
text	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
typesetting	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
video
virtualization
X11	FONTCONFIG_FILE: remove setters to /etc/fonts/fonts.conf	2014-10-05 17:05:27 +02:00