summaryrefslogtreecommitdiffstats
path: root/src/v8/0004-Generalize-external-object-resources.patch
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@nokia.com>2011-09-06 11:08:48 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-06 11:08:48 +0200
commita446ff945f4921e96dd366eb1f0eaa2d5f505428 (patch)
treedff3014aeb9497e85dca1b65f45ee53e2602dab0 /src/v8/0004-Generalize-external-object-resources.patch
parent665e4ec0ec959a12a6b66cdd0533bd40b29cd56d (diff)
parenta6b6e760ac2f019b9ca42847b9535207966811aa (diff)
Merge "Merge remote branch 'gerrit/master' into HEAD" into refactor
Diffstat (limited to 'src/v8/0004-Generalize-external-object-resources.patch')
-rw-r--r--src/v8/0004-Generalize-external-object-resources.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/v8/0004-Generalize-external-object-resources.patch b/src/v8/0004-Generalize-external-object-resources.patch
index f44e7b2134..a05aad0889 100644
--- a/src/v8/0004-Generalize-external-object-resources.patch
+++ b/src/v8/0004-Generalize-external-object-resources.patch
@@ -1,7 +1,7 @@
From 4827116b12c50f6662794017c5a662b5dbb2da0b Mon Sep 17 00:00:00 2001
From: Aaron Kennedy <aaron.kennedy@nokia.com>
Date: Mon, 23 May 2011 16:55:35 +1000
-Subject: [PATCH 04/13] Generalize external object resources
+Subject: [PATCH 04/16] Generalize external object resources
V8 was already able to manage and finalize an external string
resource. This change generalizes that mechanism to handle a
@@ -890,5 +890,5 @@ index a209cd0..1bdb5c7 100644
--
-1.7.2.3
+1.7.6