diff options
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 145 |
1 files changed, 0 insertions, 145 deletions
@@ -1,147 +1,2 @@ -<<<<<<< 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 -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/.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/ - -# 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 -/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 @ r75993 |