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
..
2012-01-18 20:16:00 +00:00
2011-08-04 12:13:53 +00:00
2012-01-18 20:53:01 +00:00
2012-01-31 06:59:02 +00:00
2011-09-07 03:45:51 +00:00
2012-01-18 20:16:00 +00:00
2011-10-14 18:04:34 +00:00
2012-01-18 20:16:00 +00:00
2012-01-18 20:16:00 +00:00
2012-01-19 21:31:51 +00:00
2012-01-18 20:16:00 +00:00
2012-01-18 20:16:00 +00:00
2012-02-06 05:49:27 +00:00
2011-03-15 23:09:14 +00:00
2011-06-21 18:00:23 +00:00
2012-01-20 15:29:04 +00:00
2012-01-18 20:16:00 +00:00
2011-08-21 00:10:12 +00:00
2012-01-18 20:16:00 +00:00
2012-01-18 20:16:00 +00:00
2011-12-11 19:39:06 +00:00
2012-01-18 20:16:00 +00:00
2012-01-18 19:44:16 +00:00
2012-01-18 20:16:00 +00:00
2012-01-18 20:52:45 +00:00
2012-01-18 20:53:01 +00:00
2011-08-07 01:45:26 +00:00
2012-01-18 20:16:00 +00:00
2011-04-23 20:58:15 +00:00
2012-01-18 20:16:00 +00:00
2012-01-18 20:52:07 +00:00
2012-01-18 20:16:00 +00:00
2011-05-02 17:03:05 +00:00
2012-01-18 20:16:00 +00:00
2012-01-18 20:53:01 +00:00
2011-10-31 14:44:32 +00:00
2012-01-10 09:43:46 +00:00
2012-01-18 20:16:00 +00:00
2012-01-18 20:16:00 +00:00
2012-01-08 14:01:17 +00:00
2012-01-05 23:15:33 +00:00
2012-01-18 20:16:00 +00:00
2012-01-18 20:16:00 +00:00
2012-01-06 21:06:22 +00:00
2012-01-18 20:16:00 +00:00
2012-01-18 20:32:37 +00:00