← Back to branch summary

~rpadovani/oxide/type-info

« back to all changes in this revision

Viewing changes to patches/add-oxide-resources.patch

  • Committer: Riccardo Padovani
  • Date: 2015-10-19 07:56:29 UTC
  • mfrom: (1088.1.131 oxide)
  • Revision ID: riccardo@rpadovani.com-20151019075629-z0mlhwlb9xflkovw
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/add-oxide-resources.patch
4
4
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
5
5
--- a/tools/gritsettings/resource_ids
6
6
+++ b/tools/gritsettings/resource_ids
7
 
@@ -235,9 +235,12 @@
8
 
   # translation scripts know of their existence.
9
 
   "android_webview/java/strings/android_webview_strings.grd": {},
10
 
   "chrome/android/java/strings/android_chrome_strings.grd": {},
11
 
   "content/public/android/java/strings/android_content_strings.grd": {},
12
 
   "ui/accessibility/extensions/strings/accessibility_extensions_strings.grd": {},
13
 
   "ui/android/java/strings/android_ui_strings.grd": {},
 
7
@@ -280,9 +280,12 @@
 
8
   "chrome/browser/devtools/device/webrtc/resources.grd": {
 
9
     "includes": [30820],
 
10
   },
 
11
   "chrome/browser/resources/settings/settings_resources.grd": {
 
12
     "structures": [30920],
 
13
   },
14
14
 
15
15
   # Resource ids starting at 31000 are reserved for projects built on Chromium.
16
16
+  "oxide_resources.grd": {