diff options
| author | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 18:49:15 +0000 |
|---|---|---|
| committer | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 18:49:15 +0000 |
| commit | faf4664b0686d0e0dfa3d960acd744b022c6e091 (patch) | |
| tree | 693cd9dc7bf9c9f541a639c74783892fb1a72cb5 | |
| parent | d0778059e8048589ea56ba911f080bb1ffeaf905 (diff) | |
| download | chromium_src-faf4664b0686d0e0dfa3d960acd744b022c6e091.zip chromium_src-faf4664b0686d0e0dfa3d960acd744b022c6e091.tar.gz chromium_src-faf4664b0686d0e0dfa3d960acd744b022c6e091.tar.bz2 | |
Merge Quickoffice patch 33.96.1843.71 to Chrome M33 branch
BUG=chromium:343158
TEST=manual
Review URL: https://codereview.chromium.org/160913002
git-svn-id: svn://svn.chromium.org/chrome/branches/1750/src@251093 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/quick_office/manifest_editor.json | 2 | ||||
| -rw-r--r-- | chrome/browser/resources/quick_office/manifest_viewing.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/resources/quick_office/manifest_editor.json b/chrome/browser/resources/quick_office/manifest_editor.json index dd28912..5cddb6f 100644 --- a/chrome/browser/resources/quick_office/manifest_editor.json +++ b/chrome/browser/resources/quick_office/manifest_editor.json @@ -85,7 +85,7 @@ "sub_package_path": "_platform_specific/arm/" } ], - "version": "33.96.1843.41", + "version": "33.96.1843.71", "web_accessible_resources": [ "views/qowt.html" ] diff --git a/chrome/browser/resources/quick_office/manifest_viewing.json b/chrome/browser/resources/quick_office/manifest_viewing.json index 8b8e959..1482a81d 100644 --- a/chrome/browser/resources/quick_office/manifest_viewing.json +++ b/chrome/browser/resources/quick_office/manifest_viewing.json @@ -83,7 +83,7 @@ "sub_package_path": "_platform_specific/arm/" } ], - "version": "33.96.1843.41", + "version": "33.96.1843.71", "web_accessible_resources": [ "views/qowt.html" ] |