HomeSort by relevance Sort by last modified time
    Searched full:conflict (Results 26 - 50 of 1741) sorted by null

12 3 4 5 6 7 8 91011>>

  /development/ndk/platforms/android-18/include/GLES3/
gl3ext.h 15 * that does not conflict with gl2ext.h or gl3.h.
  /external/chromium/android/jni/
jni_utils.h 14 namespace jni { // To avoid name conflict with similar functions in webkit
  /external/chromium/crypto/third_party/nss/
README.chromium 13 conflict with the same-named types defined in "base/basictypes.h".
  /external/chromium_org/build/
intsafe_workaround.h 12 // code in third_party that has partial versions of stdint types that conflict.
  /external/chromium_org/chrome/browser/resources/file_manager/foreground/js/ui/
conflict_dialog.js 33 this.applyAllCheckbox_.id = 'conflict-confirm-dialog-apply-all-checkbox';
71 this.frame_.id = 'conflict-confirm-dialog';
75 * Result of conflict confirm dialogs.
90 * Shows the conflict confirm dialog.
  /external/chromium_org/chrome/browser/sync_file_system/
conflict_resolution_resolver.cc 24 // conflict resolution policy.
sync_file_system.proto 21 // should be fetched for solving the conflict (resolve-to-remote resolution).
remote_change_processor.h 48 // on conflict resolution, but NOT for applying local changes to the remote,
58 // This may fail with an error but should NOT result in a conflict
81 // resolve a conflict by uploading the local file).
  /external/chromium_org/chrome/installer/linux/debian/
prerm 11 # Treat conflict remove as an upgrade.
  /external/chromium_org/dbus/
dbus_export.h 10 // NOTE: We haven't used DBUS_EXPORT because it would conflict with the version
  /external/chromium_org/sync/engine/
sync_directory_update_handler.cc 88 // Conflict resolution sometimes results in more updates to apply.
112 // processed by the conflict resolver. It could, in theory, modify the
113 // local hierarchy on which hierarchy conflict detection depends. However,
114 // the conflict resolution algorithm currently in use does not allow this.
  /external/chromium_org/third_party/angle/build/
all.gyp 13 # Otherwise auto-generated sln files will overwrite/conflict the
  /external/clang/test/CXX/except/except.spec/
p15.cpp 4 // Thus, explicit specs aren't allowed to conflict.
  /external/compiler-rt/lib/asan/lit_tests/TestCases/
free_hook_realloc.cc 1 // Check that free hook doesn't conflict with Realloc.
  /external/jpeg/
jconfig.vc 19 #ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
  /external/llvm/test/Linker/
2003-05-31-LinkerRename.ll 5 ; does not conflict.
  /external/llvm/test/TableGen/
defmclass.td 47 // These multiclasses shouldn't conflict.
  /external/qemu/distrib/jpeg-6b/
jconfig.vc 19 #ifndef __RPCNDR_H__ /* don't conflict if rpcndr.h already read */
  /frameworks/base/core/java/android/database/sqlite/
SQLiteAbortException.java 22 * or as the result of using the ABORT conflict clause.
  /frameworks/native/opengl/include/GLES3/
gl3ext.h 15 * that does not conflict with gl2ext.h or gl3.h.
  /prebuilts/ndk/9/platforms/android-18/arch-arm/usr/include/GLES3/
gl3ext.h 15 * that does not conflict with gl2ext.h or gl3.h.
  /prebuilts/ndk/9/platforms/android-18/arch-mips/usr/include/GLES3/
gl3ext.h 15 * that does not conflict with gl2ext.h or gl3.h.
  /prebuilts/ndk/9/platforms/android-18/arch-x86/usr/include/GLES3/
gl3ext.h 15 * that does not conflict with gl2ext.h or gl3.h.
  /external/chromium_org/net/http/
http_status_code_list.h 50 HTTP_STATUS(CONFLICT, 409, "Conflict")
  /external/chromium/chrome/browser/sync/engine/
conflict_resolver.cc 47 // METRIC simple conflict resolved by merge.
60 // METRIC conflict resolved by overwrite.
93 // METRIC simple conflict resolved by merge.
111 VLOG(1) << "Resolving simple conflict, ignoring local changes for:"
115 VLOG(1) << "Resolving simple conflict, overwriting server changes for:"
209 // METRIC conflict resolved by breaking dir loop.
230 // conflict was detected.
254 // METRIC conflict resolved by recreating dir tree.
276 // the conflict was detected.
296 // TODO(sync): Revisit syncer code organization to see if conflict
    [all...]

Completed in 358 milliseconds

12 3 4 5 6 7 8 91011>>