aszlig 35944168e4 Merge pull request #1970 from @ambrop72. ... We already have a desktop icon from the browser wrapper, so this is only for people who do not use the wrapper (for example if you don't want to use Mozilla plugins). Also, we someday might want to propagate the desktop item to the browser wrapper as well. Conflicts: pkgs/applications/networking/browsers/chromium/default.nix		2014-04-20 17:46:18 +02:00
..
applications	Merge pull request #1970 from @ambrop72.	2014-04-20 17:46:18 +02:00
build-support	Move su to the base packages of chrootenv builder	2014-04-18 13:30:24 +02:00
data	man-pages: Update to 3.64	2014-04-16 18:43:38 +02:00
desktops	Merge pull request #2241 from roelof1967/master	2014-04-18 10:06:49 -07:00
development	libopus: Allow to enable custom modes.	2014-04-19 03:58:45 +02:00
games	Move su to the base packages of chrootenv builder	2014-04-18 13:30:24 +02:00
misc	oxygen_gtk: update from 1.4.4 to 1.4.5	2014-04-12 11:59:03 +02:00
os-specific	linux: Enable transparent hugepages	2014-04-16 22:40:07 +02:00
servers	v8: Bring back old version 3.14.	2014-04-19 03:58:44 +02:00
shells	ipython: update 1.1.0 -> 2.0.0	2014-04-13 21:55:27 +02:00
stdenv	typo	2014-04-14 10:27:36 +02:00
test
tools	Merge pull request #2314 from iyzsong/kakasi	2014-04-18 10:31:48 -07:00
top-level	v8: Bring back old version 3.14.	2014-04-19 03:58:44 +02:00