Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix the last of the linker errors ! | Ben Murdoch | 2009-08-17 | 8 | -9/+58 |
| | |||||
* | Linker error fixes. | Ben Murdoch | 2009-08-17 | 1 | -3/+3 |
| | |||||
* | more localized strings | Andrei Popescu | 2009-08-17 | 1 | -0/+216 |
| | |||||
* | sort out inspector linking errors | Andrei Popescu | 2009-08-17 | 1 | -0/+4 |
| | |||||
* | Continue with linker error fixes. | Ben Murdoch | 2009-08-17 | 3 | -1/+16 |
| | |||||
* | Merge change 21503 into master-webkit-merge | Android (Google) Code Review | 2009-08-17 | 4 | -0/+29 |
|\ | | | | | | | | | * changes: A bunch of linker error fixes | ||||
| * | A bunch of linker error fixes | Andrei Popescu | 2009-08-17 | 4 | -0/+29 |
| | | |||||
* | | Fix first set of linker errors. | Ben Murdoch | 2009-08-17 | 3 | -61/+2 |
|/ | |||||
* | Compilation fixes. | Ben Murdoch | 2009-08-17 | 2 | -3/+4 |
| | |||||
* | WebViewCore fix | Andrei Popescu | 2009-08-17 | 2 | -8/+8 |
| | |||||
* | Merge change 21488 into master-webkit-merge | Android (Google) Code Review | 2009-08-17 | 1 | -0/+8 |
|\ | | | | | | | | | * changes: Fix compilation error inside ImageDecoderSkia.cpp | ||||
| * | Fix compilation error inside ImageDecoderSkia.cpp | Ben Murdoch | 2009-08-17 | 1 | -0/+8 |
| | | |||||
* | | PluginView.cpp fix | Andrei Popescu | 2009-08-17 | 1 | -2/+2 |
| | | |||||
* | | ResourceHandleAndroid fix | Andrei Popescu | 2009-08-17 | 2 | -8/+1 |
|/ | |||||
* | Merge change 21484 into master-webkit-merge | Android (Google) Code Review | 2009-08-17 | 2 | -3/+3 |
|\ | | | | | | | | | * changes: Fix FontCustomPlatformData.h as in https://bugs.webkit.org/show_bug.cgi?id=28065 | ||||
| * | Fix FontCustomPlatformData.h as in https://bugs.webkit.org/show_bug.cgi?id=28065 | Andrei Popescu | 2009-08-17 | 2 | -3/+3 |
| | | |||||
* | | More build fixes. | Ben Murdoch | 2009-08-17 | 4 | -7/+14 |
|/ | |||||
* | Merge change 21481 into master-webkit-merge | Android (Google) Code Review | 2009-08-17 | 7 | -9/+8 |
|\ | | | | | | | | | * changes: Fix some errors in platform/graphics/android. | ||||
| * | Fix some errors in platform/graphics/android. | Ben Murdoch | 2009-08-17 | 7 | -9/+8 |
| | | |||||
* | | Fix RenderThemeAndroid following the changes in ↵ | Andrei Popescu | 2009-08-17 | 1 | -5/+5 |
|/ | | | | http://trac.webkit.org/changeset/43367/trunk/WebCore/dom/Element.h | ||||
* | Merge change 21276 into master-webkit-merge | Android (Google) Code Review | 2009-08-14 | 1 | -2/+4 |
|\ | | | | | | | | | * changes: InspectorController fix | ||||
| * | InspectorController fix | Andrei Popescu | 2009-08-14 | 1 | -2/+4 |
| | | |||||
* | | Fixes for Clipboard and IconDatabase | Ben Murdoch | 2009-08-14 | 2 | -8/+1 |
|/ | |||||
* | Fix ClipboardAndroid. | Ben Murdoch | 2009-08-14 | 2 | -0/+6 |
| | |||||
* | Merge change 21269 into master-webkit-merge | Android (Google) Code Review | 2009-08-14 | 1 | -3/+3 |
|\ | | | | | | | | | * changes: Rename functions in TouchList binding. | ||||
| * | Rename functions in TouchList binding. | Ben Murdoch | 2009-08-14 | 1 | -3/+3 |
| | | |||||
* | | Fix ReadWriteLock class problem. Will upstream this asap | Andrei Popescu | 2009-08-14 | 1 | -6/+4 |
| | | |||||
* | | Fix V8DOMWrapper.cpp | Andrei Popescu | 2009-08-14 | 1 | -1/+3 |
|/ | |||||
* | Merge change 21263 into master-webkit-merge | Android (Google) Code Review | 2009-08-14 | 6 | -12/+31 |
|\ | | | | | | | | | * changes: And some more bindings fixes. | ||||
| * | And some more bindings fixes. | Ben Murdoch | 2009-08-14 | 6 | -12/+31 |
| | | |||||
* | | More V8 compliation fixes | Andrei Popescu | 2009-08-14 | 2 | -2/+11 |
|/ | |||||
* | Fix a bunch more bindings errors. | Ben Murdoch | 2009-08-13 | 8 | -58/+97 |
| | |||||
* | Add todo to remember to check with Grace if this merge was correct | Andrei Popescu | 2009-08-13 | 1 | -0/+1 |
| | |||||
* | Merge change 21098 into master-webkit-merge | Android (Google) Code Review | 2009-08-13 | 4 | -15/+14 |
|\ | | | | | | | | | * changes: Fix some build errors. | ||||
| * | Fix some build errors. | Ben Murdoch | 2009-08-13 | 4 | -15/+14 |
| | | |||||
* | | Fix left over maunal merges | Andrei Popescu | 2009-08-13 | 9 | -101/+12 |
|/ | |||||
* | More changes to get V8 bindings to build. | Ben Murdoch | 2009-08-13 | 1 | -0/+1 |
| | |||||
* | Restore Android.derived.mk that seems to have been emptied during the merge. | Ben Murdoch | 2009-08-13 | 1 | -0/+741 |
| | |||||
* | Use HTMLElementsAllInOne.cpp | Ben Murdoch | 2009-08-13 | 1 | -70/+1 |
| | |||||
* | Merge change 20934 into master-webkit-merge | Android (Google) Code Review | 2009-08-12 | 7 | -0/+50 |
|\ | | | | | | | | | * changes: Merge half of V8Binding/binding | ||||
| * | Merge half of V8Binding/binding | Andrei Popescu | 2009-08-12 | 7 | -0/+50 |
| | | |||||
* | | Merge change 20940 into master-webkit-merge | Android (Google) Code Review | 2009-08-12 | 6 | -5/+154 |
|\ \ | | | | | | | | | | | | | * changes: r47029: Merge V8Index and V8Proxy. | ||||
| * | | r47029: Merge V8Index and V8Proxy. | Ben Murdoch | 2009-08-12 | 6 | -5/+154 |
| |/ | |||||
* | | Merge change 20939 into master-webkit-merge | Android (Google) Code Review | 2009-08-12 | 1 | -2/+1 |
|\ \ | | | | | | | | | | | | | * changes: Fix typo | ||||
| * | | Fix typo | Nicolas Roard | 2009-08-12 | 1 | -2/+1 |
| | | | |||||
* | | | Merge change 20931 into master-webkit-merge | Android (Google) Code Review | 2009-08-12 | 9 | -75/+54 |
|\ \ \ | |/ / | | / | |/ |/| | * changes: Fix merges and add #if PLATFORM(ANDROID) | ||||
| * | Fix merges and add #if PLATFORM(ANDROID) | Nicolas Roard | 2009-08-12 | 9 | -75/+54 |
| | | |||||
* | | r47029: Merges WebCore/page, plugins and storage. | Ben Murdoch | 2009-08-12 | 13 | -142/+2 |
| | | |||||
* | | Merge change 20919 into master-webkit-merge | Android (Google) Code Review | 2009-08-12 | 14 | -900/+6 |
|\ \ | | | | | | | | | | | | | * changes: Merge r47029: Resolve merge conflicts in JavaScriptCore and WebCore/bindings. | ||||
| * | | Merge r47029: Resolve merge conflicts in JavaScriptCore and WebCore/bindings. | Ben Murdoch | 2009-08-12 | 14 | -900/+6 |
| |/ |