Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk ... Merge conflicts: * unzip (almost trivial) * dvswitch (trivial) * gmp (copied result of `git merge`) The last item introduced gmp-5.0.3, thus full rebuild. +ensureDir->mkdir -p in TeX packages was catched by git but not svn. svn path=/nixpkgs/branches/stdenv-updates/; revision=32091		2012-02-06 23:03:12 +00:00
..
coq	Merge from trunk up through r28790	2011-08-24 19:16:43 +00:00
cvc3	Adding CVC3 satisfiability modulo theory (SMT) solver	2010-12-05 17:28:41 +00:00
eProver	Update E prover	2012-01-04 10:31:49 +00:00
hol	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
hol_light	svn merge ^/nixpkgs/trunk	2012-02-06 23:03:12 +00:00
iprover	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
isabelle	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
leo2	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
matita	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
minisat	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
opensmt	Adding OpenSMT	2010-12-05 18:22:14 +00:00
picosat	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
prover9	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
satallax	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
spass	Adding SPASS	2010-12-04 11:43:01 +00:00
ssreflect	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
tptp	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00