nixpkgs-suyu/pkgs
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
..
applications Merge master into stdenv-updates 2013-12-29 10:01:22 +01:00
build-support
data hicolor_icon_theme: minor update 0.12 -> 0.13 2013-12-28 15:08:47 +01:00
desktops gnumeric: add schemas and icons, refactor 2013-12-28 15:45:20 +01:00
development Merge master into stdenv-updates 2013-12-29 10:01:22 +01:00
games Merge master into stdenv-updates 2013-12-29 10:01:22 +01:00
misc Merge master into stdenv-updates 2013-12-29 10:01:22 +01:00
os-specific Change pmount download address and add platforms 2013-12-24 10:50:40 +01:00
servers Merge master into stdenv-updates 2013-12-29 10:01:22 +01:00
shells Merge master into stdenv-updates 2013-12-29 10:01:22 +01:00
stdenv stdenv/setup.sh: fix previous change... 2013-12-28 10:43:34 +01:00
test
tools Merge master into stdenv-updates 2013-12-29 10:01:22 +01:00
top-level Merge master into stdenv-updates 2013-12-29 10:01:22 +01:00