nixpkgs/pkgs/applications/networking/browsers
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
..
arora
chromium svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00
conkeror conkeror-1.0pre-20120105 2012-01-21 18:28:51 +00:00
elinks
firefox svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
icecat-3 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 2012-01-18 20:53:01 +00:00
konq-plugins
links
links2 Merge two nix exprs for links2, upgrade to 2.5 2012-02-01 22:33:35 +00:00
lynx
midori
mozilla
mozilla-plugins * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
netsurf
opera * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 2012-01-18 20:53:01 +00:00
rekonq rekonq-0.8.1 2011-12-16 10:48:59 +00:00
uzbl
vimprobable2 Adding vimprobable2. Patch by Alexander Forenmy. 2012-01-04 22:12:43 +00:00
w3m