diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-05 14:36:32 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:30 +0100 |
| commit | f05b935882198ccf7d81675736e3aeb089c5113a (patch) | |
| tree | 4ea0ca838d9ef1b15cf17ddb3928efb427c7e5a1 /.gitignore | |
| parent | 60fbdcc62bced8db2cb1fd233cc4d1e4ea17db1b (diff) | |
| download | external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.zip external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.gz external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.bz2 | |
Merge WebKit at r74534: Initial merge by git.
Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 146 |
1 files changed, 145 insertions, 1 deletions
@@ -1,2 +1,146 @@ +<<<<<<< HEAD WebKitBuild/* -WebCore/WebCore.xcodeproj/*
\ No newline at end of file +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: +JavaScriptCore/JavaScriptCore.gyp/*.Makefile +JavaScriptCore/JavaScriptCore.gyp/*.mk +JavaScriptCore/JavaScriptCore.gyp/*.sln +JavaScriptCore/JavaScriptCore.gyp/*.vcproj* +JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.xcodeproj +WebCore/WebCore.gyp/*.Makefile +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/*.Makefile +WebKit/chromium/*.mk +WebKit/chromium/*.sln +WebKit/chromium/*.vcproj* +WebKit/chromium/WebKit.xcodeproj +Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.xcodeproj + +# Ignore status files that manage Chromium dependencies. +WebKit/chromium/.gclient +WebKit/chromium/.gclient_entries + +# Ignore Chromium dependencies +WebKit/chromium/base/ +WebKit/chromium/gfx/ +WebKit/chromium/googleurl/ +WebKit/chromium/ipc/ +WebKit/chromium/net/ +WebKit/chromium/ppapi/ +WebKit/chromium/sdch/ +WebKit/chromium/skia/ +WebKit/chromium/testing/ +WebKit/chromium/third_party/ +WebKit/chromium/tools/ +WebKit/chromium/v8/ +WebKit/chromium/xcodebuild/ +WebKit/chromium/.gclient +WebKit/chromium/.gclient_entries +WebKit/chromium/app/ +WebKit/chromium/chromium_deps/ +WebKit/chromium/gpu/ +WebKit/chromium/media/ +WebKit/chromium/webkit/ +WebKit/chromium/printing/ +WebKit/chromium/depot_tools/ + +# 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 +/autotools/compile +/autotools/config.guess +/autotools/config.sub +/autotools/depcomp +/autotools/gtk-doc.m4 +/autotools/install-sh +/autotools/libtool.m4 +/autotools/ltmain.sh +/autotools/ltoptions.m4 +/autotools/ltsugar.m4 +/autotools/ltversion.m4 +/autotools/lt~obsolete.m4 +/autotools/missing +/autotoolsconfig.h.in +/configure +/GNUmakefile.in +/WebKit/gtk/docs/GNUmakefile.in +/WebKit/gtk/po/*.pot +/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 r74534 (trunk) |