Vladimír Čunát 52404a868d Merge recent master into staging ... Nixpkgs Hydra: ?compare=1157272 TODO: port e22889064f82be3 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
..
automake-1.11.x.nix	automake: add meta.branch	2014-11-03 12:58:08 +02:00
automake-1.12.x.nix	automake: add meta.branch	2014-11-03 12:58:08 +02:00
automake-1.13.x.nix	automake: add meta.branch	2014-11-03 12:58:08 +02:00
automake-1.14.x.nix	automake: add meta.branch	2014-11-03 12:58:08 +02:00
builder.sh
fix-test-autoconf-2.69.patch
setup-hook.sh	Cleanup: Use += to append to envHooks	2014-08-09 12:47:05 +02:00