OSDN Git Service

Merge "Do not merge: fix dns prefetch, multiply range" into gingerbread
[android-x86/external-webkit.git] / Android.mk
2010-08-24 Jean-Baptiste Querumerge -s ours from froyo-release so that upgrading...
2010-08-07 Steve Blockam a4279478: Cherry-pick WebKit change 61921 to fix...
2010-08-07 Steve Blockam 2b6ea029: Cherry-pick WebKit change 60984 to fix...
2010-07-15 Joe OnoratoMerge "The ICU data is no longer compiled directly...
2010-07-14 Joe OnoratoThe ICU data is no longer compiled directly into the...
2010-05-18 The Android Open... merge from open-source master
2010-05-17 The Android Open... merge from open-source master
2010-04-02 The Android Open... merge from open-source master
2010-03-11 Ben MurdochMerge "Prepare touch key modifiers for upstreaming."
2010-03-11 Steve BlockMerge "Marks remaining Android-specific changes to...
2010-03-11 Steve BlockMerge "Update Android to reflect final version submitte...
2010-03-10 Leon ScrogginsMerge "Use a paint with 80% alpha instead of saveLayer...
2010-03-10 Bart SearsMerge "Switch default build to use V8 on Passion and...
2010-03-10 Andrei PopescuSwitch default build to use V8 on Passion and Sholes.
2010-03-03 Jean-Baptiste Queruam fa65eb8a: (-s ours) am 9a77bf56: Revert "Use STLPort...
2010-03-03 Jean-Baptiste Queruam 9a77bf56: Revert "Use STLPort instead of our strippe...
2010-03-03 Jean-Baptiste QueruRevert "Use STLPort instead of our stripped version...
2010-03-03 Jean-Baptiste Queruam 381c572c: (-s ours) am f0073a99: Use STLPort instead...
2010-03-03 Claire Hoam dd77efd5: (-s ours) am 60326ce1: Android ICU4...
2010-03-03 Jean-Baptiste Queruam f0073a99: Use STLPort instead of our stripped versio...
2010-03-03 Jean-Baptiste QueruUse STLPort instead of our stripped version. DO NOT...
2010-03-03 Steve BlockMerge "Adds Android-specific expected results for some...
2010-03-03 Andrei PopescuMerge "Fix V8 build when instrumentation is on"
2010-03-03 Steve BlockMerge "Fixes a crash in WeakJavaInstance"
2010-03-03 Mike Reedbump up our image cache etc. when we're on larger devic...
2010-03-02 Derek Sollenbergeram 4e409302: am a506357e: Adding logging to android...
2010-03-01 Steve BlockMerge "Adds Android-specific result for a Geolocation...
2010-02-26 Leon ClarkeMerge " Don't crash when throwing javascript excepti...
2010-02-26 Steve BlockMerge "Adds layout tests for HTML5 features"
2010-02-26 Ben MurdochMerge "Only set the DatabaseTracker path if it has...
2010-02-26 Shimeng (Simon)... Merge "Prevent unsafe upper casting by checking Element...
2010-02-25 Andrei PopescuMerge "Temporarily disable debugger support on V8 due...
2010-02-25 Cary ClarkMerge "refactor drawing to support layers"
2010-02-25 Shimeng (Simon)... Merge "Use reference instead of vector copying when...
2010-02-24 Cary Clarkrefactor drawing to support layers
2010-02-24 Derek Sollenbergeram 70a336f2: am da8d052d: Merge "adding logging to...
2010-02-24 Patrick Scottam f494d11a: (-s ours) am 48633eb7: Do not merge.
2010-02-24 Derek Sollenbergeram 5bce6668: am 15027de7: Added new logging messages...
2010-02-23 Steve BlockMerge "Fixes a bug with showing the Geolocation permiss...
2010-02-23 Huahui WuWhile upstreaming the JSC JIT patch to the open source...
2010-02-23 Ben MurdochMerge "Co-ordinates of a TouchEvent object should be...
2010-02-23 Steve BlockMerge "Updates Android to final version of Geolocation...
2010-02-23 Steve BlockMerge "Cherry-pick WebKit change 55136 to add a means...
2010-02-23 Mike Reedadd optional build flag to trigger enabling layers
2010-02-22 Derek Sollenbergeram 4c76da0e: am 1044e7fd: Fixes error where plugin...
2010-02-17 Cary ClarkMerge "Add UI considerations to layers"
2010-02-17 Steve BlockMerge "Updates Android to reflect upstreaming of CHROMI...
2010-02-17 Steve BlockMerge "Updates Android to reflect upstreaming of guards...
2010-02-16 Patrick ScottUse the new stlport build configuration.
2010-02-12 Mike ReedMerge "move children into SkLayer make SkLayer inherit...
2010-02-12 Huahui WuAdd code that enables SquirrelFish Extreme (a.k.a JSCX...
2010-02-12 Steve BlockMerge "Cherry-pick recent WebKit changes to JavaClassJS...
2010-02-11 Mathias Agopiansplit libsurfaceflinger_client and libcamera_client...
2010-02-05 The Android Open... am 8e03c5a1: am c3e14116: reconcile main tree with...
2010-02-04 Steve BlockMerge webkit.org at r54127 : GIFImageDecoder now requir...
2010-02-04 Steve BlockMerge webkit.org at r54127 : Fix Makefiles
2010-02-04 Steve BlockMerge webkit.org at r54127 : Keep ours for Makefiles.
2010-02-04 Steve BlockMerge webkit.org at r54127 : Initial merge by git
2010-02-03 Ben Murdochresolved conflicts for merge of a82364c2 to master
2010-01-29 Ben MurdochMerge "Cherry pick the diff after going through review...
2010-01-27 Shimeng (Simon)... Merge "No text wrapping in FitToScreen mode when text...
2010-01-27 Steve BlockV8 can now use WebCore/bridge/jni/JNIBridge.cpp
2010-01-27 Steve BlockV8 can now use WebCore/bridge/jni/JNIBridge.h
2010-01-25 Derek Sollenbergeram 562a8a46: am 53c84f3c: Do not allow the plugin to...
2010-01-25 Derek Sollenbergeram 71ce050b: am c45f962c: Merge "Correcting how the...
2010-01-25 Grace Klobaresolved conflicts for merge of 98c97471 to master
2010-01-25 Grace KlobaMerge "Merge pinch zoom from Eclair to Master. Including,"
2010-01-25 Derek Sollenbergeram 53e1af87: am 2eb76d0b: Add logging for all plugin...
2010-01-25 Andrei PopescuFix build by
2010-01-25 Andrei PopescuMerge "Prepare ScriptController class for upstreaming."
2010-01-25 Andrei PopescuMerge "Remove Android-specific TODOs as the changes...
2010-01-22 Grace Klobaam de7e9124: am ec4b5ee4: As we are sharing the view...
2010-01-22 Grace Klobaam 6d849f2b: (-s ours) am b99dd716: DO NOT MERGE
2010-01-21 Grace KlobaMerge commit 'db0b7b50' into merge
2010-01-21 Grace KlobaMerge commit '91d051d3' into tmp
2010-01-21 Steve BlockMerge changes I1b4ba984,I6cadc4f4,Icf99c709,Id22d59b7...
2010-01-21 Steve BlockMove V8 jni_npobject to bridge/jni/v8/JavaNPObjectV8...
2010-01-21 Steve BlockMove V8 jni_instance to bridge/jni/v8/JavaInstanceV8...
2010-01-21 Grace Klobaam bfcc13fc: (-s ours) am 0a3f01ac: Merge "DO NOT MERGE...
2010-01-21 Grace Klobaam 67c90537: am 72acb46d: Fix the crash of exiting...
2010-01-20 Grace Klobaresolved conflicts for merge of 9dabd572 to master
2010-01-20 Steve BlockMove V8 jni_class to bridge/jni/v8/JavaClassV8 and...
2010-01-20 Steve Blockam d9b562d6: am 032a9065: Merge "Cherry-pick WebKit...
2010-01-20 Steve Blockam 0cfc2e19: am 315ee382: Merge "Cherry-pick WebKit...
2010-01-20 Steve Blockresolved conflicts for merge of 3f4b1969 to master
2010-01-19 Grace Klobaam 2ba2794f: am 4d667d7f: Exit the fullscreen mode...
2010-01-19 Steve Blockam f83060e8: am be164dbc: Cherry-pick WebKit change...
2010-01-19 Steve Blockresolved conflicts for merge of acf4a21d to master
2010-01-19 Steve Blockresolved conflicts for merge of df644d06 to master
2010-01-19 Steve BlockMerge "Cherry-pick WebKit change 53412 to move jni_inst...
2010-01-19 Grace Klobaam 9611825c: am 6a5a35ed: Merge "Should check the enabl...
2010-01-19 Grace Klobaam 1a318d00: am 336f436c: Don\'t call setNPWindowRect...
2010-01-19 Grace Klobaam 4b178ce7: (-s ours) am f48712a0: DO NOT MERGE.
2010-01-15 Grace Klobaam 8a2903f5: am b8a54826: Don\'t use static jclass...
2010-01-14 Nicolas Roardam 93f808ab: am 388e461f: Add proper support for fixed...
2010-01-14 Nicolas Roardam 459f6c34: am 29b325cb: Fix \'disappearing layers...
2010-01-14 Steve Blockam 594a3479: am 44364d80: Merge "Update jni_runtime...
2010-01-14 Steve Blockresolved conflicts for merge of a08c8a5f to master
2010-01-14 Steve Blockam a48cb1ea: Merge "Move general includes before bindin...
2010-01-14 Steve BlockMerge "Move general includes before bindings includes...
next