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
..
source	chromium: Drop conditionals for version 33.	2014-04-20 17:45:25 +02:00
browser.nix	chromium: Drop conditionals for version 33.	2014-04-20 17:45:25 +02:00
common.nix	chromium/common: Wrap lines to 80 characters.	2014-04-20 17:45:25 +02:00
default.nix	Merge pull request #1970 from @ambrop72.	2014-04-20 17:46:18 +02:00
plugins.nix	chromium/plugins: Use Debian package from sources.	2014-04-19 03:58:45 +02:00
sandbox.nix	chromium: Update beta and dev to latest versions.	2014-04-20 17:45:24 +02:00
update.sh	chromium: Move update.sh back into the main path.	2014-04-20 17:45:25 +02:00