NixOS/nixpkgs
NixOS/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs synced 2024-10-22 17:37:37 -04:00
Code Activity
nixpkgs/pkgs/applications/networking/p2p/twister
History
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