Files
nixpkgs/pkgs/development
Vladimír Čunát 52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
..
2014-10-31 23:50:54 +08:00
2014-10-24 11:55:48 +02:00
2014-10-28 14:36:17 +01:00
2014-11-05 15:00:44 +01:00