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-11-05 12:12:30 +01:00
2014-04-18 00:45:26 +02:00
2014-07-14 21:33:05 +09:00
2014-06-13 17:57:04 +02:00
2014-06-24 21:25:11 +02:00
2014-08-08 17:40:14 +02:00
2014-08-28 11:39:03 -07:00
2014-04-16 16:58:06 +02:00
2014-08-24 17:10:19 +02:00
2014-08-27 23:41:15 +02:00
2014-10-07 21:46:15 +02:00
2014-07-14 21:33:05 +09:00
2014-09-07 19:41:00 +02:00
2014-07-02 12:28:18 -04:00
2014-06-30 09:03:33 +04:00
2014-06-13 17:57:04 +02:00
2014-08-27 22:44:56 +02:00
2014-06-13 17:57:04 +02:00
2014-07-02 12:28:18 -04:00
2014-11-03 12:32:27 +01:00
2014-11-03 12:36:56 +01:00
2014-08-31 21:39:03 +02:00
2014-05-06 20:04:22 +02:00