Correct date in merge markers
authoroliver <oliver@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Oct 2007 20:54:15 +0000 (20:54 +0000)
committeroliver <oliver@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Oct 2007 20:54:15 +0000 (20:54 +0000)
RS=Darin

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@26552 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog
LayoutTests/ChangeLog
WebCore/ChangeLog
WebKit/ChangeLog
WebKitTools/ChangeLog

index a17e4ba144739513b54c7f455cad1645ff66e73f..c44a39c9860a438aee067ee27a5d0640e8d4fb88 100644 (file)
@@ -1,4 +1,4 @@
-=== Start merge of feature-branch 11-11-2007 ===
+=== Start merge of feature-branch 2007-10-12 ===
 
 2007-10-11  Andrew Wellington  <proton@wiretapped.net>
 
         (WTF::FloatHashTraits::deletedValue):
         (WTF::):
 
-=== End merge of feature-branch 11-11-2007 ===
+=== End merge of feature-branch 2007-10-12 ===
 
 2007-10-11  Mark Rowe  <mrowe@apple.com>
 
index ea90c073d9ae6f2db28e8f7e35746878844e55f2..e9fecde50018e622a347985f8d4a60c9307443e3 100644 (file)
@@ -24,7 +24,7 @@
         * platform/mac/dom/xhtml/level2/html/HTMLBaseElement02-expected.txt:
         * platform/mac/fast/dom/dom-parse-serialize-expected.txt:
 
-=== Start merge of feature-branch 11-11-2007 ===
+=== Start merge of feature-branch 2007-10-12 ===
 
 2007-10-11  Oliver Hunt  <oliver@apple.com>
 
         * svg/custom/hit-test-unclosed-subpaths-expected.txt: Added.
         * svg/custom/hit-test-unclosed-subpaths.svg: Added.
 
-=== End merge of feature-branch 11-11-2007 ===
+=== End merge of feature-branch 2007-10-12 ===
 
 2007-10-11  Justin Garcia  <justin.garcia@apple.com>
 
index 730529d4449c351b13e33e953ac9c5bda5171740..36693c1fba735174e3827a7143ca19f8cba0e292 100644 (file)
@@ -33,7 +33,7 @@
         * WebCore.pro:
         * WebCore.vcproj/WebCore.vcproj:
 
-=== Start merge of feature-branch 11-11-2007 ===
+=== Start merge of feature-branch 2007-10-12 ===
 
 2007-10-11  Oliver Hunt  <oliver@apple.com>
 
         (WebCore::copyCGPathClosingSubpaths):
         (WebCore::Path::contains): use new copy & close function
 
-=== End merge of feature-branch 11-11-2007 ===
+=== End merge of feature-branch 2007-10-12 ===
 
 2007-10-11  Jon Honeycutt  <jhoneycutt@apple.com>
 
index dc405f5f9e32f5252d87bdd8c71a927c763c8e8c..7dacf71c4dcc92489b8be549a3b30598c61596ce 100644 (file)
@@ -1,4 +1,4 @@
-=== Start merge of feature-branch 11-11-2007 ===
+=== Start merge of feature-branch 2007-10-12 ===
 
 2007-10-03  Andrew Wellington  <proton@wiretapped.net>
 
@@ -53,7 +53,7 @@
 
         * Configurations/WebKit.xcconfig:
 
-=== End merge of feature-branch 11-11-2007 ===
+=== End merge of feature-branch 2007-10-12 ===
 
 2007-10-11  Mark Rowe  <mrowe@apple.com>
 
index 130932d7b168eae8f4af9f7ba800fb5df6f32ef6..3c03335280ad9f75da195c8751a803132729b750 100644 (file)
@@ -1,4 +1,4 @@
-=== Start merge of feature-branch 11-11-2007 ===
+=== Start merge of feature-branch 2007-10-12 ===
 
 2007-10-08  Eric Seidel  <eric@webkit.org>
 
@@ -87,7 +87,7 @@
 
         * Scripts/build-webkit
         
-=== End merge of feature-branch 11-11-2007 ===
+=== End merge of feature-branch 2007-10-12 ===
 
 2007-10-11  Kevin McCullough  <kmccullough@apple.com>