Make AppListModel::MergeItems more robust
[chromium-blink-merge.git] / .gitignore
blob815707e9f9c0585deef9d3944a4b53ac5f856bfb
1 *.gypcmd
2 *.mk
3 *.ncb
4 *.opensdf
5 *.props
6 *.pyc
7 *.rules
8 *.sdf
9 *.sln
10 *.suo
11 *.targets
12 *.user
13 *.vcproj
14 *.vcxproj
15 *.vcxproj.filters
16 *.vpj
17 *.vpw
18 *.vpwhistu
19 *.vtg
20 *.xcodeproj
21 *_proto.xml
22 *_proto_cpp.xml
24 !Android.mk
25 .*.sw?
26 .DS_Store
27 .classpath
28 .cproject
29 .gdb_history
30 .gdbinit
31 .metadata
32 .project
33 .pydevproject
34 # Settings directory for eclipse
35 /.settings
36 .checkstyle
37 cscope.*
38 Session.vim
39 tags
40 Thumbs.db
41 v8.log
42 /_out
43 /android_emulator_sdk
44 /arm-sysroot
45 /base/base_unittests_run.xml
46 /breakpad/src/
47 /build/Debug
48 /build/Debug_x64
49 /build/gomacc.lock
50 /build/ipch/
51 /build/Release
52 /build/Release_x64
53 /build/util/LASTCHANGE*
54 /build/util/support
55 /build/x64/
56 /build/linux/bin/eu-strip
57 # The Chrome OS build creates a /c symlink due to http://crbug.com/54866.
59 /ceee/internal/
60 /chrome/angle_unittests_run.xml
61 /chrome/content_gl_tests_run.xml
62 /chrome/gl_tests_run.xml
63 /chrome/gles2_conform_test_run.xml
64 /chrome/tab_capture_performance_tests_run.xml
65 /chrome/telemetry_gpu_test_run.xml
66 /chrome/app/theme/default_100_percent/google_chrome
67 /chrome/app/theme/default_200_percent/google_chrome
68 /chrome/app/theme/google_chrome
69 /chrome/browser/autofill/internal
70 /chrome/browser/extensions/default_extensions/chromeos
71 /chrome/browser/google/linkdoctor_internal
72 /chrome/browser/intents/internal/
73 /chrome/browser/internal
74 /chrome/browser/performance_monitor/performance_monitor.xml
75 /chrome/browser/protector/internal
76 /chrome/browser/resources/chromeos/quickoffice
77 /chrome/browser/resources/pdf/html_office
78 /chrome/browser/resources/settings_internal/
79 /chrome/browser/resources/software_rendering_list
80 /chrome/browser/search_engines/prepopulated_engines.xml
81 /chrome/browser/spellchecker/internal
82 /chrome/browser_tests_run.xml
83 /chrome/chrome_run.xml
84 /chrome/chrome_user32_delay_imports.xml
85 /chrome/chrome_version_resources.xml
86 /chrome/common/extensions/api/api.xml
87 /chrome/Hammer
88 /chrome/installer/linux/debian_wheezy_amd64-sysroot/
89 /chrome/installer/linux/debian_wheezy_i386-sysroot/
90 /chrome/installer/linux/internal
91 /chrome/installer/mac/internal
92 /chrome/installer/mac/third_party/xz/xz
93 /chrome/installer/mini_installer.xml
94 /chrome/installer/mini_installer/mini_installer.aps
95 /chrome/installer/mini_installer/support
96 /chrome/installer/mini_installer_syzygy.xml
97 /chrome/installer/mini_installer_tests_run.xml
98 /chrome/installer_util_strings.xml
99 /chrome/interactive_ui_tests_run.xml
100 /chrome/setup.xml
101 /chrome/setup_unittests.xml
102 /chrome/supplement.gypi
103 /chrome/sync_integration_tests_run.xml
104 /chrome/test/chromeos/autotest/files/client/deps/chrome_test/test_src/
105 /chrome/test/chromeos/autotest/files/client/deps/page_cycler_dep/test_src/
106 /chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/test_src/
107 /chrome/test/chromeos/autotest/files/client/deps/telemetry_dep/test_src/
108 /chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin
109 /chrome/test/data/firefox2_profile/searchplugins
110 /chrome/test/data/firefox2_searchplugins
111 /chrome/test/data/firefox3_profile/searchplugins
112 /chrome/test/data/firefox3_searchplugins
113 /chrome/test/data/gpu/vectortown_endurance/
114 /chrome/test/data/gpu/vt/
115 /chrome/test/data/layout_tests
116 /chrome/test/data/osdd
117 /chrome/test/data/perf/canvas_bench
118 /chrome/test/data/perf/frame_rate/content
119 /chrome/test/data/perf/frame_rate/private
120 /chrome/test/data/perf/private/
121 /chrome/test/data/perf/third_party/
122 /chrome/test/data/plugin/
123 /chrome/test/data/pyauto_private
124 /chrome/tools/memory
125 /chrome/tools/test/reference_build
126 /chrome/unit_tests_run.xml
127 /chrome_elf/chrome_elf_resources.xml
128 /cloud_print/cloud_print_version_resources.xml
129 /components/chrome_settings_proto_generated_compile.xml
130 /components/cloud_policy_proto_generated_compile.xml
131 /components/rappor.xml
132 /components/variations.xml
133 /content/content_unittests_run.xml
134 /content/test/data/gpu/generated/
135 /content/test/data/gpu/gpu_reference/
136 /content/test/data/layout_tests/
137 /content/test/data/plugin/
138 /data
139 /delegate_execute
140 /google_apis/gcm/gcm.xml
141 /google_apis/internal
142 /googleurl
143 /gpu/gles2_conform_test
144 /gyp-mac-tool
145 /llvm
146 /media/cast/logging/cast_logging_proto_lib.xml
147 /media/cdm/ppapi/api
148 /media/media_asm.xml
149 /media/test/data/content
150 /media/test/data/security
151 /media/yuv_convert_simd_x86.xml
152 /metro_driver
153 /mojo/hello_world_service.xml
154 /mojo/mojo_gles2_bindings.xml
155 /mojo/mojo_launcher_bindings.xml
156 /mojo/mojo_native_viewport_bindings.xml
157 /mojo/mojo_public_bindings_unittests.xml
158 /mojo/mojo_public_unittests.xml
159 /mojo/mojo_sample_service.xml
160 /mojo/mojo_service_manager_unittests.xml
161 /mojo/mojo_shell_bindings.xml
162 /mojo/mojo_view_manager_bindings.xml
163 /mojo/mojom_test.xml
164 /mojo/sample_service.xml
165 /native_client
166 /net/Debug
167 /net/net_unittests_run.xml
168 /net/Release
169 /net/testserver.log
170 /out
171 /out_*
172 /pdf
173 /ppapi/native_client/nacl_irt.xml
174 /ppapi/native_client/ppapi_lib.xml
175 /ppapi/native_client/src/shared/ppapi_proxy/nacl_ppapi_browser.xml
176 /ppapi/native_client/src/shared/ppapi_proxy/ppruntime_lib.xml
177 /ppapi/native_client/src/trusted/plugin/ppGoogleNaClPluginChrome.xml
178 /remoting/appengine/
179 /remoting/host/installer/linux/internal/
180 /remoting/proto/chromotocol_proto_lib.xml
181 /remoting/proto/trace_proto_lib.xml
182 /remoting/remoting_core_resources.xml
183 /remoting/remoting_elevated_controller.xml
184 /remoting/remoting_host.xml
185 /remoting/remoting_host_event_logger.xml
186 /remoting/remoting_host_installation.xml
187 /remoting/remoting_host_installation_unittest.xml
188 /remoting/remoting_host_messages.xml
189 /remoting/remoting_infoplist_strings.xml
190 /remoting/remoting_lib_idl.xml
191 /remoting/remoting_lib_rc.xml
192 /remoting/remoting_me2me_host.xml
193 /remoting/remoting_native_messaging_manifests.xml
194 /remoting/remoting_version_resources.xml
195 /remoting/remoting_windows_resources.xml
196 /remoting/tools/internal/
197 /sandbox/linux/seccomp-legacy/
198 /sdch/open-vcdiff
199 /seccompsandbox
200 /skia/tools/clusterfuzz-data/
201 /sync/sync.xml
202 /sync_testserver.log
203 /testing/gmock
204 /testing/gtest
205 /testing/iossim/third_party/
206 /testserver.log
207 /third_party/accessibility-developer-tools/
208 /third_party/adobe/flash/binaries
209 /third_party/adobe/flash/symbols
210 /third_party/amd/
211 /third_party/android_tools/
212 /third_party/android_tools_internal/
213 /third_party/angle
214 /third_party/angle_dx11
215 /third_party/aosp
216 /third_party/apache-mime4j
217 /third_party/asan
218 /third_party/bidichecker
219 /third_party/bison
220 /third_party/brotli/src
221 /third_party/cacheinvalidation/cacheinvalidation_unittests_run.xml
222 /third_party/cacheinvalidation/src
223 /third_party/chromeos_login_manager
224 /third_party/chromeos_text_input
225 /third_party/chromite
226 /third_party/clang_format/bin/*/*
227 !/third_party/clang_format/bin/*/*.sha1
228 /third_party/cld_2/src
229 /third_party/cros
230 /third_party/cros_system_api
231 /third_party/cygwin
232 /third_party/directxsdk
233 /third_party/drmemory
234 /third_party/eyesfree/src
235 /third_party/ffmpeg
236 /third_party/findbugs
237 /third_party/flac
238 /third_party/fontconfig/src
239 /third_party/freetype
240 /third_party/freetype2/src
241 /third_party/gles2_conform
242 /third_party/gnu_binutils/
243 /third_party/gold
244 /third_party/google_appengine_cloudstorage
245 /third_party/google_toolbox_for_mac/src
246 /third_party/googlemac
247 /third_party/gperf
248 /third_party/guava/src
249 /third_party/httpcomponents-client
250 /third_party/httpcomponents-core
251 /third_party/hunspell
252 /third_party/hunspell_dictionaries
253 /third_party/icu
254 /third_party/jarjar
255 /third_party/jsoncpp/source
256 /third_party/jsr-305/src
257 /third_party/leveldatabase/src
258 /third_party/leveldb
259 /third_party/libaddressinput/src
260 /third_party/libc++/trunk
261 /third_party/libc++abi/trunk
262 /third_party/libexif/sources
263 /third_party/libjingle/source
264 /third_party/libjingle/source_internal
265 /third_party/libjpeg_turbo
266 /third_party/liblouis/src
267 /third_party/libphonenumber/libphonenumber.xml
268 /third_party/libphonenumber/libphonenumber_without_metadata.xml
269 /third_party/libphonenumber/src
270 /third_party/libsrtp
271 /third_party/libvpx
272 /third_party/libwebm/source
273 /third_party/libyuv
274 /third_party/lighttpd
275 /third_party/llvm
276 /third_party/llvm-allocated-type
277 /third_party/llvm-build
278 /third_party/lss
279 /third_party/mesa/src
280 /third_party/mingw-w64
281 /third_party/mkl
282 /third_party/mt19937ar
283 /third_party/nacl_sdk_binaries/
284 /third_party/nss
285 /third_party/openmax_dl/
286 /third_party/openssl
287 /third_party/opus/src
288 /third_party/ots
289 /third_party/pdfsqueeze
290 /third_party/pefile
291 /third_party/perl
292 /third_party/platformsdk_win7
293 /third_party/platformsdk_win8
294 /third_party/polymer
295 /third_party/ppapi
296 /third_party/psyco_win32
297 /third_party/pthreads-win32
298 /third_party/pyelftools
299 /third_party/pyftpdlib/src
300 /third_party/pylib
301 /third_party/pymox/src
302 /third_party/python_24
303 /third_party/python_26
304 /third_party/pywebsocket/src
305 /third_party/pywebsocket/src
306 /third_party/safe_browsing/testing
307 /third_party/scons-2.0.1
308 /third_party/sfntly/cpp
309 /third_party/skia
310 /third_party/smhasher
311 /third_party/snappy/src
312 /third_party/speex
313 /third_party/swiftshader/include/
314 /third_party/swig
315 /third_party/syzygy
316 /third_party/syzygy/binaries
317 /third_party/trace-viewer
318 /third_party/tsan/
319 /third_party/undoview
320 /third_party/usb_ids
321 /third_party/usrsctp/usrsctplib
322 /third_party/v8-i18n
323 /third_party/valgrind
324 /third_party/v4l2capture
325 /third_party/webdriver/pylib
326 /third_party/webdriver/python/selenium
327 /third_party/webgl
328 /third_party/webgl/src
329 /third_party/WebKit
330 /third_party/webpagereplay/
331 /third_party/webrtc
332 /third_party/webrtc/internal
333 /third_party/webrtc/modules/video_coding/codecs/vp8_internal
334 /third_party/widevine/cdm/chromeos
335 /third_party/widevine/cdm/linux
336 /third_party/widevine/cdm/mac
337 /third_party/widevine/cdm/win
338 /third_party/widevine/test/license_server
339 /third_party/win_toolchain/.timestamps
340 /third_party/win_toolchain/files
341 /third_party/wix
342 /third_party/xdg-utils
343 /third_party/xulrunner-sdk
344 /third_party/yasm/binaries
345 /third_party/yasm/generate_files.xml
346 /third_party/yasm/source/patched-yasm
347 /third_party/yasm/yasm.xml
348 /tools/deps2git/
349 /tools/distcc
350 /tools/gn/bin/linux
351 /tools/gn/bin/mac
352 /tools/gn/bin/win
353 /tools/grit
354 /tools/gyp
355 /tools/histograms
356 /tools/json_schema_compiler/test/json_schema_compiler_tests.xml
357 /tools/metrics/histograms/histograms.before.pretty-print.xml
358 /tools/page_cycler/acid3
359 /tools/perf/data
360 /tools/perf/internal
361 /tools/perf/results.html
362 /tools/swarming_client
363 /tools/tryserver
364 /tools/win/link_limiter/build
365 /ui/surface/surface.xml
366 /ui/surface/surface_gpu_tests.xml
368 /webkit/data/bmp_decoder
369 /webkit/data/ico_decoder
370 /webkit/data/layout_tests/LayoutTests
371 /webkit/data/test_shell/plugins
372 /webkit/data/xbm_decoder
373 /webkit/Debug
374 /webkit/Release
375 /webkit/renderer/media/crypto/ppapi/cdm
376 /webpagereplay_logs/
377 /win8/delegate_execute/delegate_execute_version_resources.xml
378 /win8/metro_driver/metro_driver_version_resources.xml
379 /x86-generic_out/
380 /xcodebuild