~chromium-team/chromium-browser/artful-beta

« back to all changes in this revision

Viewing changes to debian/patches/7-npapi-permission-not-defaults-to-unauthorized.patch

  • Committer: Chad Miller
  • Date: 2014-02-21 00:14:13 UTC
  • Revision ID: chad.miller@canonical.com-20140221001413-xeloyqxq52xndv72
* Upstream release 33.0.1750.115.
* debian/rules, debian/control: Switch to using ninja instead of make to
  build. Switch from CDBS to dh. Remove many old hacks.
* debian/patches/disable_gn.patch: disable broken GN before build. Temporary
  hack.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
--- a/src/chrome/browser/browser_resources.grd
2
2
+++ b/src/chrome/browser/browser_resources.grd
3
 
@@ -211,6 +211,7 @@
 
3
@@ -218,6 +218,7 @@
4
4
         </if>
5
5
         <if expr="not pp_ifdef('chromeos')">
6
6
           <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_linux.json" type="BINDATA" />