diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-26 16:54:26 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-26 20:42:16 +0100 |
| commit | 2ad019df21529ed45b333e6acd4935b8a430436a (patch) | |
| tree | 9b1305d6be3f4e7756bdd10d1250bb8bfde21608 | |
| parent | 3dff810fe0cc4962a5fa554318e9bf8bc45f5274 (diff) | |
| download | external_chromium-2ad019df21529ed45b333e6acd4935b8a430436a.zip external_chromium-2ad019df21529ed45b333e6acd4935b8a430436a.tar.gz external_chromium-2ad019df21529ed45b333e6acd4935b8a430436a.tar.bz2 | |
Merge Chromium at 12.0.742.130: Fix conflicts
5080607 Update external/chromium to latest revision
Did not sync the build directory last merge, so
git think it is added, this gives a conflict in the
file with local changes.
Change-Id: I3e2fcf5f78a02046a092ef8a3e31bd8ba0429b52
| -rw-r--r-- | build/build_config.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/build/build_config.h b/build/build_config.h index fab9da0..df16071 100644 --- a/build/build_config.h +++ b/build/build_config.h @@ -49,7 +49,6 @@ #if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || \ defined(OS_SOLARIS) -<<<<<<< HEAD #if defined(ANDROID) #define USE_OPENSSL 1 @@ -65,12 +64,6 @@ #else #undef USE_X11 #endif -======= -#if !defined(USE_OPENSSL) -#define USE_NSS 1 // Default to use NSS for crypto, unless OpenSSL is chosen. -#endif -#define USE_X11 1 // Use X for graphics. ->>>>>>> chromium.org at 12.0.742.130 #endif #if defined(USE_OPENSSL) && defined(USE_NSS) @@ -80,12 +73,8 @@ // For access to standard POSIXish features, use OS_POSIX instead of a // more specific macro. #if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \ -<<<<<<< HEAD defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_NACL) || \ defined(ANDROID) -======= - defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_NACL) ->>>>>>> chromium.org at 12.0.742.130 #define OS_POSIX 1 // Use base::DataPack for name/value pairs. #define USE_BASE_DATA_PACK 1 |