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
..
1.8.nix
clang.patch
cpp-4.5.patch
default.nix
disable-gc-sensitive-tests.patch
eai_system.patch
gcov-file-name.patch
setup-hook-2.0.sh
setup-hook.sh