Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates ... Conflicts: pkgs/applications/networking/browsers/chromium/default.nix pkgs/top-level/all-packages.nix Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.		2013-02-21 11:13:30 -05:00
..
arora
chromium	Merge branch 'master' into stdenv-updates	2013-02-21 11:13:30 -05:00
conkeror	conkeror-1.0pre-20120316	2012-03-17 09:18:11 +00:00
elinks	Rename hostDrv -> crossDrv, buildDrv -> nativeDrv	2012-12-28 19:08:19 +01:00
firefox	Fix Firefox 13.0 URL. 13.0 is still used by selenium.	2013-02-07 22:19:09 +01:00
icecat-3	* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.	2012-01-18 20:53:01 +00:00
konq-plugins	Switch to forward compatibility of kde45 on kde_baseapps.	2011-08-07 01:45:26 +00:00
links
links2	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
lynx	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
midori	Update/fix Midori	2012-03-25 11:22:32 +00:00
mozilla
mozilla-plugins	flashplayer-11: Update to version 11.2.202.262.	2013-02-12 10:42:19 +01:00
netsurf	Mark some packages as low priority and disambiguate some others	2012-11-29 15:26:13 +01:00
opera	opera: Update to 12.12	2012-12-20 14:45:15 +01:00
rekonq	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
uzbl	Update Uzbl	2012-11-08 10:34:06 +04:00
vimprobable2	vimprobable2: updating to 1.2.0	2013-01-23 00:04:47 +01:00
w3m	w3m: Disable parallel building	2013-01-17 14:35:52 +01:00