Files
nixpkgs/pkgs/top-level
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
..
2014-09-02 11:44:09 +02:00
2014-08-27 03:21:03 -04:00
2014-05-30 21:08:56 +01:00
2014-08-25 09:52:38 +02:00