Vladimír Čunát e740b565cf Merge master into stdenv-updates ... Conflicts (easy): pkgs/development/compilers/llvm/default.nix pkgs/development/compilers/openjdk/default.nix pkgs/development/libraries/icu/default.nix pkgs/development/libraries/libssh/default.nix pkgs/development/libraries/libxslt/default.nix pkgs/development/tools/parsing/bison/3.x.nix		2013-12-29 10:01:22 +01:00
..
admin
archivers	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
audio
backup	obnam: Update to 1.6	2013-12-18 16:21:47 +01:00
bluetooth
cd-dvd	xorriso: add missing attr dependency	2013-12-21 02:28:26 +02:00
compression	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
filesystems	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
graphics	netpbm: fix CVE-2005-2471	2013-12-25 11:11:59 +01:00
inputmethods/fcitx
misc	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
networking	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
package-management
security	gnupg1: update to version 1.4.16	2013-12-19 17:20:53 +01:00
system	Upgrade rsyslog to latest stable, 7.4.7. Include systemd journal support.	2013-12-23 17:42:20 +01:00
text	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
typesetting	docbook2odf: new package	2013-12-20 12:25:57 +01:00
video	swfmill: update from 0.3.2 to 0.3.3	2013-12-21 02:28:26 +02:00
virtualization
X11	Merge x-updates	2013-12-25 23:56:41 +01:00