2
0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-26 23:54:01 +00:00
nixpkgs/pkgs/development/libraries/physfs
Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
2013-02-21 11:13:30 -05:00
..
default.nix Merge branch 'master' into stdenv-updates 2013-02-21 11:13:30 -05:00