Files
nixpkgs/pkgs/development/ocaml-modules
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-10-28 14:00:48 +01:00
2014-10-28 14:03:14 +01:00
2014-09-23 09:34:13 +01:00
2014-09-27 01:09:53 +01:00
2013-06-07 21:40:38 +02:00
2014-10-19 18:48:40 +02:00
2014-09-23 09:34:13 +01:00
2014-10-29 20:15:39 +01:00
2014-09-23 09:34:13 +01:00
2014-10-11 00:54:35 +01:00
2013-06-16 22:33:33 +02:00
2014-10-31 14:14:17 +01:00
2014-09-27 01:09:53 +01:00
2014-09-23 09:34:13 +01:00
2014-07-21 10:56:51 +02:00
2014-10-11 00:49:50 +01:00
2014-08-30 19:37:15 +04:00
2014-09-23 09:34:13 +01:00
2014-09-23 09:34:13 +01:00
2014-10-29 21:15:50 +01:00
2014-10-10 14:47:33 +01:00
2014-08-30 19:37:15 +04:00