nixpkgs/pkgs/development/compilers/hhvm
Vladimír Čunát 9b02635faa Merge recent master into x-updates
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
2014-07-21 12:05:57 +02:00
..
default.nix Merge recent master into x-updates 2014-07-21 12:05:57 +02:00