Lluís Batlle i Rossell b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts. ... svn path=/nixpkgs/branches/stdenv-updates/; revision=25188		2010-12-17 20:39:58 +00:00
..
3.08.0.nix	* Get rid of many instances of "args: with args;", and other coding	2010-07-28 11:55:54 +00:00
3.10.0.nix	Include directory for OCaml's C headers.	2010-09-03 13:48:35 +00:00
3.11.1.nix	Merging from trunk. I solved some trivial merge conflicts.	2010-12-17 20:39:58 +00:00
3.12.0.nix	* Enable hydra compilation for ocaml 3.11.1 (error in the previous commit)	2010-12-09 15:44:05 +00:00
builder.sh	* "." -> "source".	2005-12-05 14:11:09 +00:00
configure-3.08.0	fixed ocaml/qcmm problem:	2006-03-01 09:18:22 +00:00
cvs.nix	Porting changes from stdenv-updates into this branch.	2009-11-08 00:32:12 +00:00
mips64.patch	Updating the patch for ocaml on mips.	2010-10-25 21:13:05 +00:00