Skip to content

GitLab

T
tangled
Commit b2c2f9cb authored by barraclough@apple.com's avatar barraclough@apple.com
Browse files
Options

Whoops, fixerate ChangeLog. 

git-svn-id: svn://svn.chromium.org/blink/trunk@53866 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent c01d7269
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
third_party/WebKit/WebCore/ChangeLog
View file @ b2c2f9cb
<<<<<<< .mine
2010-01-25 Gavin Barraclough <barraclough@apple.com> 2010-01-25 Gavin Barraclough <barraclough@apple.com>
Reviewed by Anders Carlsson. Reviewed by Anders Carlsson.
...@@ -22,7 +21,6 @@ ...@@ -22,7 +21,6 @@
* bridge/jni/jsc/JavaInstanceJSC.cpp: * bridge/jni/jsc/JavaInstanceJSC.cpp:
(JavaInstance::stringValue): (JavaInstance::stringValue):
=======
2010-01-26 Steve Falkenburg <sfalken@apple.com> 2010-01-26 Steve Falkenburg <sfalken@apple.com>
Reviewed by Oliver Hunt. Reviewed by Oliver Hunt.
...@@ -365,7 +363,6 @@ ...@@ -365,7 +363,6 @@
(WebCore::XMLTokenizer::XMLTokenizer): (WebCore::XMLTokenizer::XMLTokenizer):
(WebCore::parseXMLDocumentFragment): (WebCore::parseXMLDocumentFragment):
>>>>>>> .r53864
2010-01-22 Jeremy Orlow <jorlow@chromium.org> 2010-01-22 Jeremy Orlow <jorlow@chromium.org>
Reviewed by Darin Adler. Reviewed by Darin Adler.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment