Eelco Dolstra 811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv ... Conflicts: pkgs/tools/security/gnupg/default.nix		2014-10-09 10:57:57 +02:00
..
admin
archivers	Revert "gnutar: Update to 1.28"	2014-10-07 18:38:07 +02:00
audio
backup	rsnapshot: set meta.platforms	2014-10-01 22:29:33 +02:00
bluetooth
cd-dvd
compression	Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv	2014-10-09 10:57:57 +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/staging' into darwin-clang-stdenv	2014-10-09 10:57:57 +02:00
networking	Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv	2014-10-09 10:57:57 +02:00
package-management	Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv	2014-10-09 10:57:57 +02:00
security	Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv	2014-10-09 10:57:57 +02:00
system	Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv	2014-10-09 10:57:57 +02:00
text	Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv	2014-10-09 10:57:57 +02:00
typesetting	Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv	2014-10-09 10:57:57 +02:00
video
virtualization
X11	FONTCONFIG_FILE: remove setters to /etc/fonts/fonts.conf	2014-10-05 17:05:27 +02:00