[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 11:10:20 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f71f9177afafd185d3135ff468f52e0d060754ab
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jul 14 09:54:59 2010 +0000
2010-07-14 Vincent Scheib <scheib at chromium.org>
Reviewed by Kent Tamura
Configure Git to ignore build files generated by Chromium .gyp on windows.
Bug 42205: Chromium build files on windows not ignored by git
https://bugs.webkit.org/show_bug.cgi?id=42205
* .gitignore: Updated
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63302 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/.gitignore b/.gitignore
index ea78643..277912a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,8 +8,17 @@ autoinstall.cache.d
WebKitTools/Scripts/webkitpy/thirdparty/autoinstalled
# Ignore Chromium projects auto-generated from .gyp files:
+JavaScriptCore/JavaScriptCore.gyp/*.sln
+JavaScriptCore/JavaScriptCore.gyp/*.vcproj*
JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.xcodeproj
+WebCore/WebCore.gyp/*.mk
+WebCore/WebCore.gyp/*.rules
+WebCore/WebCore.gyp/*.sln
+WebCore/WebCore.gyp/*.tmp
+WebCore/WebCore.gyp/*.vcproj*
WebCore/WebCore.gyp/WebCore.xcodeproj
+WebKit/chromium/*.sln
+WebKit/chromium/*.vcproj*
WebKit/chromium/WebKit.xcodeproj
WebKitTools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.xcodeproj
diff --git a/ChangeLog b/ChangeLog
index b04876a..124e86c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-14 Vincent Scheib <scheib at chromium.org>
+
+ Reviewed by Kent Tamura
+
+ Configure Git to ignore build files generated by Chromium .gyp on windows.
+
+ Bug 42205: Chromium build files on windows not ignored by git
+ https://bugs.webkit.org/show_bug.cgi?id=42205
+
+ * .gitignore: Updated
+
2010-07-13 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r63262.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list