mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 00:10:30 +00:00
Code Issues Wiki Activity
nixpkgs/nixos/doc
History
Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging. 
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
2014-09-02 12:31:03 +02:00
..
manual Merge branch 'origin/master' into staging. 2014-09-02 12:31:03 +02:00