diff options
| author | Cary Clark <> | 2009-04-14 06:36:55 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-14 06:36:55 -0700 |
| commit | 76fc394d65b2db7f55e09874fa383a153e2bd128 (patch) | |
| tree | 5ca7f28fce014a104e13cc8492a07822550a4535 /WebKitTools/DrawTest | |
| parent | 563af33bc48281d19dce701398dbb88cb54fd7ec (diff) | |
| download | external_webkit-76fc394d65b2db7f55e09874fa383a153e2bd128.zip external_webkit-76fc394d65b2db7f55e09874fa383a153e2bd128.tar.gz external_webkit-76fc394d65b2db7f55e09874fa383a153e2bd128.tar.bz2 | |
AI 146111: update webkitmerge to handle git, svg, fix bugs
//branches/master/android/external/webkit/WebCore/Android.derived.mk
add exclusion rules for svg
//branches/master/android/external/webkit/WebCore/Android.mk
add exclusion exceptions (e.g., files from /skia/ that we use)
remove the need to have '\' at the end of each file
//branches/master/android/external/webkit/WebKitTools/android/webkitmerge/webkitmerge.cpp
don't delete modified files, but mark them with MANUAL_MERGE_REQUIRED
add --execute option (in progress)
add --perforce, --git options
fix double add of file when it appears in sandbox and new webkit
BUG=1553405
Automated import of CL 146111
Diffstat (limited to 'WebKitTools/DrawTest')
0 files changed, 0 insertions, 0 deletions