[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
mihaip at chromium.org
mihaip at chromium.org
Sun Feb 20 23:11:35 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 17955547f9b6b60d49295330125d8d39545e8406
Author: mihaip at chromium.org <mihaip at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 18 21:22:07 2011 +0000
2011-01-18 Mihai Parparita <mihaip at chromium.org>
Unreviewed. Update .gitignore to reflect that WebKit is now in Source.
* .gitignore:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76052 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/.gitignore b/.gitignore
index 35d1956..1e663aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,41 +26,41 @@ Source/WebCore/WebCore.gyp/*.sln
Source/WebCore/WebCore.gyp/*.tmp
Source/WebCore/WebCore.gyp/*.vcproj*
Source/WebCore/WebCore.gyp/WebCore.xcodeproj
-WebKit/chromium/*.Makefile
-WebKit/chromium/*.mk
-WebKit/chromium/*.sln
-WebKit/chromium/*.vcproj*
-WebKit/chromium/WebKit.xcodeproj
+Source/WebKit/chromium/*.Makefile
+Source/WebKit/chromium/*.mk
+Source/WebKit/chromium/*.sln
+Source/WebKit/chromium/*.vcproj*
+Source/WebKit/chromium/WebKit.xcodeproj
Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.xcodeproj
# Ignore status files that manage Chromium dependencies.
-WebKit/chromium/.gclient
-WebKit/chromium/.gclient_entries
+Source/WebKit/chromium/.gclient
+Source/WebKit/chromium/.gclient_entries
# Ignore Chromium dependencies
-WebKit/chromium/.gclient
-WebKit/chromium/.gclient_entries
-WebKit/chromium/app/
-WebKit/chromium/base/
-WebKit/chromium/chromium_deps/
-WebKit/chromium/depot_tools/
-WebKit/chromium/gfx/
-WebKit/chromium/googleurl/
-WebKit/chromium/gpu/
-WebKit/chromium/ipc/
-WebKit/chromium/media/
-WebKit/chromium/net/
-WebKit/chromium/ppapi/
-WebKit/chromium/printing/
-WebKit/chromium/sdch/
-WebKit/chromium/skia/
-WebKit/chromium/testing/
-WebKit/chromium/third_party/
-WebKit/chromium/tools/
-WebKit/chromium/ui/
-WebKit/chromium/v8/
-WebKit/chromium/webkit/
-WebKit/chromium/xcodebuild/
+Source/WebKit/chromium/.gclient
+Source/WebKit/chromium/.gclient_entries
+Source/WebKit/chromium/app/
+Source/WebKit/chromium/base/
+Source/WebKit/chromium/chromium_deps/
+Source/WebKit/chromium/depot_tools/
+Source/WebKit/chromium/gfx/
+Source/WebKit/chromium/googleurl/
+Source/WebKit/chromium/gpu/
+Source/WebKit/chromium/ipc/
+Source/WebKit/chromium/media/
+Source/WebKit/chromium/net/
+Source/WebKit/chromium/ppapi/
+Source/WebKit/chromium/printing/
+Source/WebKit/chromium/sdch/
+Source/WebKit/chromium/skia/
+Source/WebKit/chromium/testing/
+Source/WebKit/chromium/third_party/
+Source/WebKit/chromium/tools/
+Source/WebKit/chromium/ui/
+Source/WebKit/chromium/v8/
+Source/WebKit/chromium/webkit/
+Source/WebKit/chromium/xcodebuild/
# Ignore files that Chromium port generates
/Makefile.chromium
diff --git a/ChangeLog b/ChangeLog
index 6a9a834..ffe778f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-18 Mihai Parparita <mihaip at chromium.org>
+
+ Unreviewed. Update .gitignore to reflect that WebKit is now in Source.
+
+ * .gitignore:
+
2011-01-18 Krithigassree Sambamurthy <krithigassree.sambamurthy at nokia.com>
Reviewed by Simon Fraser.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list