nixpkgs/pkgs/applications/networking/browsers/firefox
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
..
3.6.nix * Firefox 6.0.1, 3.6.21. 2011-08-31 09:12:56 +00:00
9.0.nix * Firefox updated to 9.0.1. 2012-01-03 15:18:03 +00:00
10.0.nix * Added Firefox 10.0. P.S. it seems that Firefox 10 no longer needs 2012-02-02 15:44:22 +00:00
11.0.nix Add Firefox 11beta 2012-02-06 08:28:24 +00:00
wrapper.nix * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
xulrunner-1.9.2_beta4-mips-bus-error.patch
xulrunner-chromium-mips.patch
xulrunner-mips-n32.patch