From ab9e7a118cf1ea2e3a93dce683b2ded3e7291ddb Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Mon, 16 May 2011 16:25:10 +0100
Subject: Merge WebKit at r76408: Initial merge by git.

Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
---
 .gitignore | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 145 insertions(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index e83a5dd..26a6a18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,147 @@
+<<<<<<< HEAD
 WebKitBuild/*
 WebCore/WebCore.xcodeproj/*
+=======
+*.mode*
+*.pbxuser
+*.perspective*
+*.pyc
+.DS_Store
+build/
+/WebKitBuild/
+autoinstall.cache.d
+Tools/Scripts/webkitpy/thirdparty/autoinstalled
+
+# Ignore common tool auto-generated files.
+.gdb_history
+tags
+*~
+
+# Ignore Chromium projects auto-generated from .gyp files:
+Source/JavaScriptCore/JavaScriptCore.gyp/*.Makefile
+Source/JavaScriptCore/JavaScriptCore.gyp/*.mk
+Source/JavaScriptCore/JavaScriptCore.gyp/*.sln
+Source/JavaScriptCore/JavaScriptCore.gyp/*.vcproj*
+Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.xcodeproj
+Source/WebCore/WebCore.gyp/*.Makefile
+Source/WebCore/WebCore.gyp/*.mk
+Source/WebCore/WebCore.gyp/*.rules
+Source/WebCore/WebCore.gyp/*.sln
+Source/WebCore/WebCore.gyp/*.tmp
+Source/WebCore/WebCore.gyp/*.vcproj*
+Source/WebCore/WebCore.gyp/WebCore.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.
+Source/WebKit/chromium/.gclient
+Source/WebKit/chromium/.gclient_entries
+
+# Ignore Chromium dependencies
+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
+/out
+
+# Ignore compiled java tests:
+LayoutTests/java/*.class
+
+# Though the GTK build builds in a subdirectory, autogen.sh still deposits
+# a few files into the source tree.
+/aclocal.m4
+/autom4te.cache
+/Source/autotools/compile
+/Source/autotools/config.guess
+/Source/autotools/config.sub
+/Source/autotools/depcomp
+/Source/autotools/gtk-doc.m4
+/Source/autotools/install-sh
+/Source/autotools/libtool.m4
+/Source/autotools/ltmain.sh
+/Source/autotools/ltoptions.m4
+/Source/autotools/ltsugar.m4
+/Source/autotools/ltversion.m4
+/Source/autotools/lt~obsolete.m4
+/Source/autotools/missing
+/Source/WebKit/gtk/docs/GNUmakefile.in
+/Source/WebKit/gtk/po/*.pot
+/autotoolsconfig.h.in
+/configure
+/GNUmakefile.in
+/gtk-doc.make
+/INSTALL
+/README
+
+# Ignore files installed by WebKitSupportLibrary/WebKitAuxiliaryLibrary
+/WebKitSupportLibrary.zip
+/WebKitLibraries/win/Software License Agreement for WebKit Support Libraries.rtf
+/WebKitLibraries/win/WebKitChangesToPthreads.diff
+/WebKitLibraries/win/include/ApplicationServices/
+/WebKitLibraries/win/include/AssertMacros.h
+/WebKitLibraries/win/include/Availability.h
+/WebKitLibraries/win/include/AvailabilityInternal.h
+/WebKitLibraries/win/include/AvailabilityMacros.h
+/WebKitLibraries/win/include/CFNetwork/
+/WebKitLibraries/win/include/ColorSync/
+/WebKitLibraries/win/include/ConditionalMacros.h
+/WebKitLibraries/win/include/CoreFoundation/
+/WebKitLibraries/win/include/CoreGraphics/
+/WebKitLibraries/win/include/CoreServices/
+/WebKitLibraries/win/include/ImageIO/
+/WebKitLibraries/win/include/QuartzCore/
+/WebKitLibraries/win/include/SQLite/
+/WebKitLibraries/win/include/SafariTheme/
+/WebKitLibraries/win/include/TargetConditionals.h
+/WebKitLibraries/win/include/checkint.h
+/WebKitLibraries/win/include/dispatch/
+/WebKitLibraries/win/include/inttypes.h
+/WebKitLibraries/win/include/libxml/
+/WebKitLibraries/win/include/libxslt/
+/WebKitLibraries/win/include/pthreads/
+/WebKitLibraries/win/include/stdbool.h
+/WebKitLibraries/win/include/stdint.h
+/WebKitLibraries/win/include/unicode/
+/WebKitLibraries/win/include/unistd.h
+/WebKitLibraries/win/include/xlocale.h
+/WebKitLibraries/win/include/zlib/
+/WebKitLibraries/win/lib/CFNetwork.lib
+/WebKitLibraries/win/lib/CoreFoundation.lib
+/WebKitLibraries/win/lib/CoreGraphics.lib
+/WebKitLibraries/win/lib/QuartzCore.lib
+/WebKitLibraries/win/lib/SQLite3.lib
+/WebKitLibraries/win/lib/SafariTheme.lib
+/WebKitLibraries/win/lib/icuin.lib
+/WebKitLibraries/win/lib/icuuc.lib
+/WebKitLibraries/win/lib/libdispatch.lib
+/WebKitLibraries/win/lib/libxml2.lib
+/WebKitLibraries/win/lib/libxslt.lib
+/WebKitLibraries/win/lib/pthreadVC2.lib
+/WebKitLibraries/win/lib/zdll.lib
+>>>>>>> WebKit.org at r76408
-- 
cgit v1.1