Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/poppler/default.nix		2014-10-16 15:16:50 +02:00
..
default.nix	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
install_topfind.patch	Update ocamlfind to version 1.5.3	2014-10-08 20:37:30 +02:00
ldconf.patch