Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge in WebKit r47029. | Ben Murdoch | 2009-08-11 | 203 | -23825/+48178 |
| | |||||
* | WebKitMerge tool fixes. | Ben Murdoch | 2009-08-11 | 1 | -2/+2 |
| | |||||
* | Makefile and webkitmerge tool edits needed to merge with latest webkit. | Ben Murdoch | 2009-08-11 | 1 | -28/+29 |
| | |||||
* | Implements a mechanism that limit the growth of the application cache | Andrei Popescu | 2009-07-21 | 5 | -0/+34 |
| | |||||
* | Make this host tool compile with GCC 4.4 | Jack Palevich | 2009-06-25 | 1 | -0/+1 |
| | | | | | | | | It has a dependency on cstdio (aka stdio.h), but was not explicitly including it. In previous versions of GCC the cstdio file was implictly included as a side-effect of including another library. This change is backwards compatible with earlier versions of GCC. | ||||
* | update webkitmerge with git-specific commands | Cary Clark | 2009-04-15 | 1 | -49/+118 |
| | |||||
* | updated utf16 files that differ from webkit.org CL 42026 | Cary Clark | 2009-04-15 | 1 | -0/+0 |
| | |||||
* | AI 146111: update webkitmerge to handle git, svg, fix bugs | Cary Clark | 2009-04-14 | 1 | -75/+212 |
| | | | | | | | | | | | | | | | | //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 | ||||
* | AI 146110: add missing files to webkit | Cary Clark | 2009-04-14 | 347 | -0/+71094 |
| | | | | | | brings it in sync with webkit svn cl 42046 Automated import of CL 146110 | ||||
* | AI 144627: webkitmerge is a command line tool that merges newer version of ↵ | Cary Clark | 2009-04-06 | 3 | -0/+1856 |
| | | | | | | | | | webkit to Android. It can be either run from XCode using the xcodeproj or from the command line. BUG=1553405 Automated import of CL 144627 | ||||
* | Automated import from //branches/master/...@141953,141953 | Cary Clark | 2009-03-24 | 332 | -65474/+0 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 420 | -0/+110450 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 420 | -110450/+0 |
| | |||||
* | Code drop from //branches/cupcake/...@124589 | The Android Open Source Project | 2008-12-17 | 264 | -10064/+12272 |
| | |||||
* | Initial Contribution | The Android Open Source Project | 2008-10-21 | 151 | -2059/+62037 |
| | |||||
* | external/webkit r30707 | Upstream | 1970-01-12 | 407 | -0/+48264 |