nixpkgs/pkgs/games/spring
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
..
default.nix Merge recent master into staging 2014-11-05 15:00:44 +01:00
springlobby.nix boost: Remove boost.lib 2014-11-02 17:22:27 -08:00