Vladimír Čunát
52404a868d
Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272
TODO: port e22889064f82be3
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
..
2014-07-28 11:31:14 +02:00
2014-09-09 13:54:24 -07:00
2010-06-22 08:06:12 +00:00
2014-11-05 15:00:44 +01:00
2011-10-15 16:34:26 +00:00
2013-04-02 18:03:08 +02:00
2010-01-06 08:43:42 +00:00
2014-08-09 12:47:05 +02:00
2014-08-09 12:47:05 +02:00