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
..
2013-10-10 13:28:20 +02:00
2014-11-03 12:36:56 +01:00
2014-09-06 21:37:46 +02:00
2014-09-06 22:54:15 +02:00
2014-08-28 02:20:23 +02:00
2014-09-13 21:48:29 +02:00
2014-11-04 05:19:07 +01:00
2014-09-03 21:23:30 +02:00
2014-08-05 15:12:26 +02:00
2013-12-11 15:32:27 +01:00
2014-08-01 15:25:50 +02:00
2014-09-15 23:03:20 +02:00
2014-09-13 21:48:29 +02:00
2013-10-10 13:28:20 +02:00
2014-04-14 16:26:48 +02:00
2014-04-14 16:26:48 +02:00
2014-09-02 01:48:50 +04:00
2013-10-10 13:28:20 +02:00
2014-10-15 12:24:50 +02:00
2014-07-02 12:28:18 -04:00
2014-08-06 16:25:42 +02:00
2014-04-14 16:26:48 +02:00
2013-10-10 13:28:20 +02:00