Mathijs Kwik c1bec6fb5b firefox-21: use more system libraries ... Conflicts: pkgs/applications/networking/browsers/firefox/21.0.nix		2013-06-11 14:05:15 +02:00
..
applications	firefox-21: use more system libraries	2013-06-11 14:05:15 +02:00
build-support	fetchsvn: Allow setting the name of the output	2013-05-26 11:58:01 -04:00
data	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
desktops	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
development	Merge branch 'master' into x-updates	2013-06-11 15:46:10 +04:00
games	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
lib	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
misc	Merge branch 'master' into x-updates	2013-06-11 15:46:10 +04:00
os-specific	Merge branch 'master' into x-updates	2013-06-11 15:46:10 +04:00
servers	Merge branch 'master' into x-updates	2013-06-11 15:46:10 +04:00
shells	fish: Add fish 2.0.0	2013-06-04 10:20:30 +01:00
stdenv	mkDerivation: Allow direct access to passthru	2013-05-03 09:07:42 -04:00
test
tools	Merge branch 'master' into x-updates	2013-06-11 15:46:10 +04:00
top-level	Merge branch 'master' into x-updates	2013-06-11 15:46:10 +04:00