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
..
4.3.2.nix	add meta.branch	2014-11-03 13:09:48 +02:00
5.0.5.nix
5.1.x.nix	get rid of nasty CC stuff	2014-09-09 13:54:26 -07:00
ignore-bad-cpuid.patch