Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge WebKit at r75315: Initial merge by git. | Steve Block | 2011-05-12 | 1 | -65/+0 |
| | | | | Change-Id: I570314b346ce101c935ed22a626b48c2af266b84 | ||||
* | Bring Android files in line with what landed at webkit.org. | Andrei Popescu | 2009-11-25 | 1 | -7/+7 |
| | | | | | | Picks up changes made by Apple in http://trac.webkit.org/changeset/51191/trunk/WebCore/platform/android/LocalizedStringsAndroid.cpp | ||||
* | Fixes license headers for all Android-specific JavaScriptCore and WebCore ↵ | Steve Block | 2009-11-13 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | files not yet upstreamed to webkit.org. WebKit requires either a BSD-style or LGPL 2.1 license for all code. We use a BSD-style 2-clause license for Android-specific files that will be upstreamed to webkit.org. - For most files, I've fixed the names of copyright holders in the license text to 'THE COPYRIGHT HOLDERS' and cleaned up formatting in the existing BSD-style license. - For Makefiles and the following files in WebCore/platform/graphics/android/, I've changed from an Apache 2.0 license to the BSD-style license. - WebCore/platform/graphics/android/BitmapAllocatorAndroid.cpp - WebCore/platform/graphics/android/BitmapAllocatorAndroid.h - WebCore/platform/graphics/android/SharedBufferStream.cpp - WebCore/platform/graphics/android/SharedBufferStream.h - For the following files, I've changed from an LGPL licese to the BSD-style license. - WebCore/platform/graphics/android/FontPlatformData.h - WebCore/platform/graphics/android/FontPlatformDataAndroid.cpp - WebCore/plugins/android/PluginDataAndroid.cpp Change-Id: Ic4c3e5610afc58637b7a9b81b1d0d1f17f4f4cb1 | ||||
* | auto import from //depot/cupcake/@136594 | The Android Open Source Project | 2009-03-05 | 1 | -2/+2 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 1 | -0/+64 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 1 | -64/+0 |
| | |||||
* | auto import from //branches/cupcake/...@127101 | The Android Open Source Project | 2009-01-20 | 1 | -24/+23 |
| | |||||
* | auto import from //branches/cupcake/...@126645 | The Android Open Source Project | 2009-01-15 | 1 | -17/+26 |
| | |||||
* | Code drop from //branches/cupcake/...@124589 | The Android Open Source Project | 2008-12-17 | 1 | -3/+2 |
| | |||||
* | Initial Contribution | The Android Open Source Project | 2008-10-21 | 1 | -0/+57 |