nixpkgs/pkgs
Vladimír Čunát 82797f98f2 Merge branch 'staging' into modular-stdenv
Conflicts:
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/stdenv/linux/default.nix
2014-09-08 18:24:58 +02:00
..
applications Merge branch 'staging' into modular-stdenv 2014-09-08 18:24:58 +02:00
build-support Merge branch 'staging' into modular-stdenv 2014-09-08 18:24:58 +02:00
data shared_mime_info: update from 1.2 to 1.3 2014-09-06 19:02:27 +02:00
desktops Merge branch 'staging' into modular-stdenv 2014-09-08 18:24:58 +02:00
development Merge branch 'staging' into modular-stdenv 2014-09-08 18:24:58 +02:00
games Merge remote-tracking branch 'origin/staging' 2014-09-08 11:42:09 +02:00
misc libretro-cores: 2014-09-04 20:03:13 +02:00
os-specific Merge branch 'staging' into modular-stdenv 2014-09-08 18:24:58 +02:00
servers Merge remote-tracking branch 'origin/staging' 2014-09-08 11:42:09 +02:00
shells pythonPackges.ipython: 2.0.0 -> 2.2.0 2014-08-25 11:01:31 +02:00
stdenv Merge branch 'staging' into modular-stdenv 2014-09-08 18:24:58 +02:00
test
tools Merge branch 'staging' into modular-stdenv 2014-09-08 18:24:58 +02:00
top-level Merge branch 'staging' into modular-stdenv 2014-09-08 18:24:58 +02:00