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
..
audio	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
display-managers
editors	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
graphics	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
ike
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
office	gnumeric: add platforms, maintainer	2013-12-28 15:49:19 +01:00
science	ngspice: update from 24 to 25	2013-12-23 05:27:10 +02:00
search
taxes
version-management	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
video	Aegisub: New Package	2013-12-25 22:24:19 +01:00
virtualization	Minor changes to Bochs expression.	2013-11-24 16:30:16 +01:00
window-managers	windowManager.xmonad: Make it configurable and extensible.	2013-12-28 09:29:53 +01:00