[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[tony at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 398a4fbe0d8a8c1f38adeb3c71a6a04d3dc1c9ee
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 10 08:41:23 2010 +0000

    2010-03-10  Tony Chang  <tony at chromium.org>
    
            Reviewed by Darin Fisher.
    
            https://bugs.webkit.org/show_bug.cgi?id=35956
            Create a grd file upstream for resources that chromium uses
            that are pulled directly from the upstream repository.
    
            * WebKit.grd: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55769 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 7e9aaaf..e672c6f 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-10  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35956
+        Create a grd file upstream for resources that chromium uses
+        that are pulled directly from the upstream repository.
+
+        * WebKit.grd: Added.
+
 2010-03-10  Roland Steiner  <rolandsteiner at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebKit/chromium/WebKit.grd b/WebKit/chromium/WebKit.grd
new file mode 100644
index 0000000..a0783d7
--- /dev/null
+++ b/WebKit/chromium/WebKit.grd
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grit latest_public_release="0" current_release="1">
+  <outputs>
+    <output filename="grit/webkit_chromium_resources.h" type="rc_header">
+      <emit emit_type='prepend'></emit>
+    </output>
+    <output filename="webkit_chromium_resources.rc" type="rc_all" />
+    <output filename="webkit_chromium_resources.pak" type="data_package" />
+  </outputs>
+  <release seq="1">
+    <includes>
+      <include name="IDR_DEVTOOLS_INJECT_DISPATCH_JS" file="src\js\InjectDispatch.js"  type="BINDATA"/>
+      <include name="IDR_DEVTOOLS_INJECT_WEBKIT_JS" file="..\..\WebCore\inspector\front-end\InjectedScript.js" type="BINDATA"/>
+    </includes>
+  </release>
+</grit>

-- 
WebKit Debian packaging