diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 10:01:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-17 10:01:16 -0800 |
| commit | 8f75286f8f97df46e2fb2411460a5efb3fc9b083 (patch) | |
| tree | eca591661d5d9fc0fc58e2d2a2d11dfc8c406ccc /JavaScriptCore/wtf/Platform.h | |
| parent | e4b2e0b8a34bdde6f219c2d755af174569fa728f (diff) | |
| parent | 4dd98cc27e25e6c3104672f50749132d2236461b (diff) | |
| download | external_webkit-8f75286f8f97df46e2fb2411460a5efb3fc9b083.zip external_webkit-8f75286f8f97df46e2fb2411460a5efb3fc9b083.tar.gz external_webkit-8f75286f8f97df46e2fb2411460a5efb3fc9b083.tar.bz2 | |
am 4dd98cc2: am aad6f24e: Merge webkit.org at r51976 : Fix general conflicts.
Merge commit '4dd98cc27e25e6c3104672f50749132d2236461b'
* commit '4dd98cc27e25e6c3104672f50749132d2236461b':
Merge webkit.org at r51976 : Fix general conflicts.
Diffstat (limited to 'JavaScriptCore/wtf/Platform.h')
| -rw-r--r-- | JavaScriptCore/wtf/Platform.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index 091ba4f..dbe2f8e 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -546,10 +546,7 @@ // This prevents unnecessary invals. #define ENABLE_TEXT_CARET 1 #define ENABLE_JAVASCRIPT_DEBUGGER 0 -<<<<<<< HEAD:JavaScriptCore/wtf/Platform.h #define ENABLE_ORIENTATION_EVENTS 1 -======= ->>>>>>> webkit.org at r51976:JavaScriptCore/wtf/Platform.h #endif #if PLATFORM(WIN) |