| Ben Murdoch | f05b935 | 2011-05-05 14:36:32 +0100 | [diff] [blame^] | 1 | <<<<<<< HEAD |
| Grace Kloba | b872347 | 2009-09-01 14:03:38 -0700 | [diff] [blame] | 2 | WebKitBuild/* |
| Ben Murdoch | f05b935 | 2011-05-05 14:36:32 +0100 | [diff] [blame^] | 3 | WebCore/WebCore.xcodeproj/* |
| 4 | ======= |
| 5 | *.mode* |
| 6 | *.pbxuser |
| 7 | *.perspective* |
| 8 | *.pyc |
| 9 | .DS_Store |
| 10 | build/ |
| 11 | /WebKitBuild/ |
| 12 | autoinstall.cache.d |
| 13 | Tools/Scripts/webkitpy/thirdparty/autoinstalled |
| 14 | |
| 15 | # Ignore common tool auto-generated files. |
| 16 | .gdb_history |
| 17 | tags |
| 18 | *~ |
| 19 | |
| 20 | # Ignore Chromium projects auto-generated from .gyp files: |
| 21 | JavaScriptCore/JavaScriptCore.gyp/*.Makefile |
| 22 | JavaScriptCore/JavaScriptCore.gyp/*.mk |
| 23 | JavaScriptCore/JavaScriptCore.gyp/*.sln |
| 24 | JavaScriptCore/JavaScriptCore.gyp/*.vcproj* |
| 25 | JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.xcodeproj |
| 26 | WebCore/WebCore.gyp/*.Makefile |
| 27 | WebCore/WebCore.gyp/*.mk |
| 28 | WebCore/WebCore.gyp/*.rules |
| 29 | WebCore/WebCore.gyp/*.sln |
| 30 | WebCore/WebCore.gyp/*.tmp |
| 31 | WebCore/WebCore.gyp/*.vcproj* |
| 32 | WebCore/WebCore.gyp/WebCore.xcodeproj |
| 33 | WebKit/chromium/*.Makefile |
| 34 | WebKit/chromium/*.mk |
| 35 | WebKit/chromium/*.sln |
| 36 | WebKit/chromium/*.vcproj* |
| 37 | WebKit/chromium/WebKit.xcodeproj |
| 38 | Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.xcodeproj |
| 39 | |
| 40 | # Ignore status files that manage Chromium dependencies. |
| 41 | WebKit/chromium/.gclient |
| 42 | WebKit/chromium/.gclient_entries |
| 43 | |
| 44 | # Ignore Chromium dependencies |
| 45 | WebKit/chromium/base/ |
| 46 | WebKit/chromium/gfx/ |
| 47 | WebKit/chromium/googleurl/ |
| 48 | WebKit/chromium/ipc/ |
| 49 | WebKit/chromium/net/ |
| 50 | WebKit/chromium/ppapi/ |
| 51 | WebKit/chromium/sdch/ |
| 52 | WebKit/chromium/skia/ |
| 53 | WebKit/chromium/testing/ |
| 54 | WebKit/chromium/third_party/ |
| 55 | WebKit/chromium/tools/ |
| 56 | WebKit/chromium/v8/ |
| 57 | WebKit/chromium/xcodebuild/ |
| 58 | WebKit/chromium/.gclient |
| 59 | WebKit/chromium/.gclient_entries |
| 60 | WebKit/chromium/app/ |
| 61 | WebKit/chromium/chromium_deps/ |
| 62 | WebKit/chromium/gpu/ |
| 63 | WebKit/chromium/media/ |
| 64 | WebKit/chromium/webkit/ |
| 65 | WebKit/chromium/printing/ |
| 66 | WebKit/chromium/depot_tools/ |
| 67 | |
| 68 | # Ignore files that Chromium port generates |
| 69 | /Makefile.chromium |
| 70 | /out |
| 71 | |
| 72 | # Ignore compiled java tests: |
| 73 | LayoutTests/java/*.class |
| 74 | |
| 75 | # Though the GTK build builds in a subdirectory, autogen.sh still deposits |
| 76 | # a few files into the source tree. |
| 77 | /aclocal.m4 |
| 78 | /autom4te.cache |
| 79 | /autotools/compile |
| 80 | /autotools/config.guess |
| 81 | /autotools/config.sub |
| 82 | /autotools/depcomp |
| 83 | /autotools/gtk-doc.m4 |
| 84 | /autotools/install-sh |
| 85 | /autotools/libtool.m4 |
| 86 | /autotools/ltmain.sh |
| 87 | /autotools/ltoptions.m4 |
| 88 | /autotools/ltsugar.m4 |
| 89 | /autotools/ltversion.m4 |
| 90 | /autotools/lt~obsolete.m4 |
| 91 | /autotools/missing |
| 92 | /autotoolsconfig.h.in |
| 93 | /configure |
| 94 | /GNUmakefile.in |
| 95 | /WebKit/gtk/docs/GNUmakefile.in |
| 96 | /WebKit/gtk/po/*.pot |
| 97 | /gtk-doc.make |
| 98 | /INSTALL |
| 99 | /README |
| 100 | |
| 101 | # Ignore files installed by WebKitSupportLibrary/WebKitAuxiliaryLibrary |
| 102 | /WebKitSupportLibrary.zip |
| 103 | /WebKitLibraries/win/Software License Agreement for WebKit Support Libraries.rtf |
| 104 | /WebKitLibraries/win/WebKitChangesToPthreads.diff |
| 105 | /WebKitLibraries/win/include/ApplicationServices/ |
| 106 | /WebKitLibraries/win/include/AssertMacros.h |
| 107 | /WebKitLibraries/win/include/Availability.h |
| 108 | /WebKitLibraries/win/include/AvailabilityInternal.h |
| 109 | /WebKitLibraries/win/include/AvailabilityMacros.h |
| 110 | /WebKitLibraries/win/include/CFNetwork/ |
| 111 | /WebKitLibraries/win/include/ColorSync/ |
| 112 | /WebKitLibraries/win/include/ConditionalMacros.h |
| 113 | /WebKitLibraries/win/include/CoreFoundation/ |
| 114 | /WebKitLibraries/win/include/CoreGraphics/ |
| 115 | /WebKitLibraries/win/include/CoreServices/ |
| 116 | /WebKitLibraries/win/include/ImageIO/ |
| 117 | /WebKitLibraries/win/include/QuartzCore/ |
| 118 | /WebKitLibraries/win/include/SQLite/ |
| 119 | /WebKitLibraries/win/include/SafariTheme/ |
| 120 | /WebKitLibraries/win/include/TargetConditionals.h |
| 121 | /WebKitLibraries/win/include/checkint.h |
| 122 | /WebKitLibraries/win/include/dispatch/ |
| 123 | /WebKitLibraries/win/include/inttypes.h |
| 124 | /WebKitLibraries/win/include/libxml/ |
| 125 | /WebKitLibraries/win/include/libxslt/ |
| 126 | /WebKitLibraries/win/include/pthreads/ |
| 127 | /WebKitLibraries/win/include/stdbool.h |
| 128 | /WebKitLibraries/win/include/stdint.h |
| 129 | /WebKitLibraries/win/include/unicode/ |
| 130 | /WebKitLibraries/win/include/unistd.h |
| 131 | /WebKitLibraries/win/include/xlocale.h |
| 132 | /WebKitLibraries/win/include/zlib/ |
| 133 | /WebKitLibraries/win/lib/CFNetwork.lib |
| 134 | /WebKitLibraries/win/lib/CoreFoundation.lib |
| 135 | /WebKitLibraries/win/lib/CoreGraphics.lib |
| 136 | /WebKitLibraries/win/lib/QuartzCore.lib |
| 137 | /WebKitLibraries/win/lib/SQLite3.lib |
| 138 | /WebKitLibraries/win/lib/SafariTheme.lib |
| 139 | /WebKitLibraries/win/lib/icuin.lib |
| 140 | /WebKitLibraries/win/lib/icuuc.lib |
| 141 | /WebKitLibraries/win/lib/libdispatch.lib |
| 142 | /WebKitLibraries/win/lib/libxml2.lib |
| 143 | /WebKitLibraries/win/lib/libxslt.lib |
| 144 | /WebKitLibraries/win/lib/pthreadVC2.lib |
| 145 | /WebKitLibraries/win/lib/zdll.lib |
| 146 | >>>>>>> webkit.org at r74534 (trunk) |