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
..
0.6.90.nix	Mark a bunch of packages as broken or not supported on Darwin	2014-08-08 17:59:02 +02:00
0.6.nix
0.10.nix	ffmpeg{_2,_1,_0_10}: minor update	2014-06-30 21:00:36 +02:00
1.x.nix	ffmpeg (_1 and default _2): minor update, incl. security	2014-08-21 15:13:18 +02:00
2.x.nix	ffmpeg: update to 2.3.3	2014-08-29 13:05:09 +01:00