Add merge markers

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index e2fbc351430bc0954fd1a050b3b165e9bfaebdaa..a17e4ba144739513b54c7f455cad1645ff66e73f 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,5 @@
+=== Start merge of feature-branch 11-11-2007 ===
+
 2007-10-11  Andrew Wellington  <proton@wiretapped.net>
 
         Reviewed by Eric Seidel.

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ffb7b31d1f2d33fc93063e4e933058ae210c2bd4..2a0436cf781bd5db391ad9f817c7481de57d7695 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,5 @@
+=== Start merge of feature-branch 11-11-2007 ===
+
 2007-10-11  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Sam.

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0a8de89543824c68b73ef208a78d2a30c74638fb..7490f78f4f8b076f5322ad2f1b4ab636bb31029f 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,5 @@
+=== Start merge of feature-branch 11-11-2007 ===
+
 2007-10-11  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Sam.

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a3fa953d041d9157bb623e26ed1e25b275961bf8..dc405f5f9e32f5252d87bdd8c71a927c763c8e8c 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,5 @@
+=== Start merge of feature-branch 11-11-2007 ===
+
 2007-10-03  Andrew Wellington  <proton@wiretapped.net>
 
         Reviewed by Mark Rowe.

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index bed81f2753acd02a1763bbe3bef9f521e19d05b7..2ffe7466fb8c580b2aecac1611dae3b573db8c2a 100644 (file)
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,5 +1,3 @@
-=== End merge of feature-branch 11-11-2007 ===
-
 2007-10-10  Alice Liu  <alice.liu@apple.com>
 
         Reviewed by Geoff Garen.

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 27a43762ba59bfeaac4e43644450056c7c064c8b..234219e123f963d02c18571ff98266067a7adce0 100644 (file)
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,3 @@
-=== End merge of feature-branch 11-11-2007 ===
-
 2007-10-10  Alice Liu  <alice.liu@apple.com>
 
         Reviewed by Geoff Garen.

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 937c2a6836934a80edbabde5da9fe4c0b4f69fc5..07c4bedbd6022a989d45d60c8978be6e03c6636d 100644 (file)
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,5 +1,3 @@
-=== End merge of feature-branch 11-11-2007 ===
-
 2007-10-11  Steve Falkenburg  <sfalken@apple.com>
 
         Delay load additional libraries to improve startup time.

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 29d9d78843e8c0f92697a131e570574503232228..7c3f4993e5fa65414851cbeb647fd918db7e704e 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,5 +1,3 @@
-=== End merge of feature-branch 11-11-2007 ===
-
 2007-10-11  Ada Chan  <adachan@apple.com>
 
         <rdar://problem/5534421>

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 25140849a2a2bad9596f7d939fb5f9a0ff62c721..130932d7b168eae8f4af9f7ba800fb5df6f32ef6 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,5 @@
+=== Start merge of feature-branch 11-11-2007 ===
+
 2007-10-08  Eric Seidel  <eric@webkit.org>
 
         Reviewed by Mark Rowe.