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
..
asdf	Update ASDF	2014-11-02 23:51:57 +03:00
clwrapper
from-quicklisp
define-package.nix
lisp-packages.nix	Update Lisp CLX	2014-11-03 12:12:24 +03:00