Files
nixpkgs/pkgs/development/tools
Vladimír Čunát 52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

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-09-21 15:18:16 -07:00
2014-05-18 20:51:08 -07:00
2014-07-22 11:01:32 +02:00
2014-07-22 11:01:32 +02:00
2014-10-10 15:27:44 +02:00
2014-10-10 15:27:44 +02:00
2014-08-24 22:31:37 +02:00
2014-10-09 12:00:34 -05:00
2014-05-31 15:49:13 +02:00
2014-11-05 15:00:44 +01:00
2014-09-13 10:04:37 +02:00
2014-11-05 15:00:44 +01:00
2014-07-22 11:01:32 +02:00
2014-11-03 13:09:48 +02:00
2014-08-24 22:31:37 +02:00
2014-10-22 16:07:37 +02:00
2014-06-30 12:48:38 +02:00
2014-05-31 15:49:13 +02:00
2014-08-24 22:31:37 +02:00