diff options
| author | Steve Block <steveblock@google.com> | 2011-01-05 12:15:11 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-01-06 14:14:00 +0000 |
| commit | d06194330da2bb8da887d2e1adeacb3a5c1504b2 (patch) | |
| tree | e0af8413af65a8e30630563441af7bdb8478e513 /JavaScriptGlue | |
| parent | 419a5cf2f8db6ca014df624865197ffb82caad37 (diff) | |
| download | external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.zip external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.gz external_webkit-d06194330da2bb8da887d2e1adeacb3a5c1504b2.tar.bz2 | |
Merge WebKit at r72805: Initial merge by Git
Note that this is a backwards merge from Chromium release 9.0.600.0
to 9.0.597.0, to align with the Chromium 9 stable release branch.
Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
Diffstat (limited to 'JavaScriptGlue')
| -rw-r--r-- | JavaScriptGlue/ChangeLog | 6 | ||||
| -rw-r--r-- | JavaScriptGlue/Configurations/Version.xcconfig | 2 | ||||
| -rw-r--r-- | JavaScriptGlue/ForwardingHeaders/wtf/OSAllocator.h | 1 |
3 files changed, 1 insertions, 8 deletions
diff --git a/JavaScriptGlue/ChangeLog b/JavaScriptGlue/ChangeLog index 9693952..c7b2dce 100644 --- a/JavaScriptGlue/ChangeLog +++ b/JavaScriptGlue/ChangeLog @@ -1,9 +1,3 @@ -2010-12-01 Geoffrey Garen <ggaren@apple.com> - - Build fix: Added a forwarding header. - - * ForwardingHeaders/wtf/OSAllocator.h: Added. - 2010-10-25 Oliver Hunt <oliver@apple.com> Reviewed by Gavin Barraclough. diff --git a/JavaScriptGlue/Configurations/Version.xcconfig b/JavaScriptGlue/Configurations/Version.xcconfig index ee86a20..d4cb8e7 100644 --- a/JavaScriptGlue/Configurations/Version.xcconfig +++ b/JavaScriptGlue/Configurations/Version.xcconfig @@ -22,7 +22,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. MAJOR_VERSION = 534; -MINOR_VERSION = 14; +MINOR_VERSION = 13; TINY_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); diff --git a/JavaScriptGlue/ForwardingHeaders/wtf/OSAllocator.h b/JavaScriptGlue/ForwardingHeaders/wtf/OSAllocator.h deleted file mode 100644 index 637611a..0000000 --- a/JavaScriptGlue/ForwardingHeaders/wtf/OSAllocator.h +++ /dev/null @@ -1 +0,0 @@ -#include <JavaScriptCore/OSAllocator.h> |