diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-14 23:42:55 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-14 23:42:55 +0000 |
| commit | faf80a1c1708ab13337a0e2c1bee04f19b9fd515 (patch) | |
| tree | cf1e3b0f46ad0542fa942254a71fcff54b26de96 /webkit/plugins | |
| parent | 41d5b8202c5abab437b201f1a3563ec26433b5db (diff) | |
| download | chromium_src-faf80a1c1708ab13337a0e2c1bee04f19b9fd515.zip chromium_src-faf80a1c1708ab13337a0e2c1bee04f19b9fd515.tar.gz chromium_src-faf80a1c1708ab13337a0e2c1bee04f19b9fd515.tar.bz2 | |
Merge 88642 - JRE6u26 sounds like it fixes some pretty nasty bugs:
http://www.oracle.com/technetwork/topics/security/javacpujune2011-313339.html
BUG=85678
Review URL: http://codereview.chromium.org/7046039
TBR=cevans@chromium.org
Review URL: http://codereview.chromium.org/7172002
git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@89099 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins')
| -rw-r--r-- | webkit/plugins/npapi/plugin_list.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc index d964e2a..9306209 100644 --- a/webkit/plugins/npapi/plugin_list.cc +++ b/webkit/plugins/npapi/plugin_list.cc @@ -93,7 +93,7 @@ static const VersionRangeDefinition kQuicktimeVersionRange[] = { { "", "", "7.6.9", true } }; static const VersionRangeDefinition kJavaVersionRange[] = { - { "0", "7", "6.0.240", true } // "240" is not a typo. + { "0", "7", "6.0.260", true } // "260" is not a typo. }; // This is up to date with // http://www.adobe.com/support/security/bulletins/apsb11-08.html |