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
..
2011-11-21 14:11:04 +00:00
2011-02-22 13:40:01 +00:00
2012-01-18 20:52:12 +00:00
2011-07-07 17:24:53 +00:00
2011-08-23 03:23:34 +00:00
2012-01-26 15:27:03 +00:00
2011-10-30 00:01:33 +00:00
2011-06-04 21:46:07 +00:00
2010-05-10 14:46:17 +00:00
2011-08-25 01:00:13 +00:00
2011-03-11 19:45:51 +00:00
2011-01-05 10:11:06 +00:00
2010-05-15 09:55:08 +00:00
2012-01-27 16:43:39 +00:00
2011-10-30 00:01:20 +00:00
2011-04-06 10:00:48 +00:00
2009-02-05 16:49:41 +00:00
2009-04-21 19:47:30 +00:00
2011-09-16 10:32:37 +00:00
2009-10-28 13:11:09 +00:00
2012-01-06 20:09:39 +00:00
2011-06-21 07:28:30 +00:00
2011-10-30 00:00:29 +00:00
2010-07-29 18:55:16 +00:00
2012-01-28 14:39:56 +00:00
2011-12-20 13:05:51 +00:00
2012-01-05 23:15:24 +00:00
2010-08-21 17:18:35 +00:00
2012-01-07 20:23:35 +00:00