OpenGrok
Home
Sort by relevance
Sort by last modified time
Full Search
Definition
Symbol
File Path
History
|
|
Help
Searched
full:conflicts
(Results
176 - 200
of
1243
) sorted by null
1
2
3
4
5
6
7
8
9
10
11
>>
/external/chromium_org/sync/internal_api/public/sessions/
model_neutral_state.h
48
// Update application and
conflicts
.
/external/chromium_org/third_party/icu/source/common/
uprops.h
254
/* #define _Lo FLAG(U_OTHER_LETTER) --
conflicts
with MS Visual Studio 9.0 xiosbase */
270
/* #define _Pe FLAG(U_END_PUNCTUATION) --
conflicts
with MS Visual Studio 9.0 xlocnum */
271
/* #define _Pc FLAG(U_CONNECTOR_PUNCTUATION) --
conflicts
with MS Visual Studio 9.0 streambuf */
278
/* #define _Pf FLAG(U_FINAL_PUNCTUATION) --
conflicts
with MS Visual Studio 9.0 streambuf */
/external/chromium_org/ui/base/x/
selection_requestor.h
10
// Get rid of a macro from Xlib.h that
conflicts
with Aura's RootWindow class.
/external/clang/test/CXX/temp/temp.decls/temp.class.spec/
p6.cpp
37
// Check for
conflicts
during template instantiation.
/external/clang/test/SemaCXX/
typedef-redecl.cpp
17
struct Y2; // expected-error{{definition of type 'Y2'
conflicts
with typedef of the same name}}
/external/dnsmasq/contrib/Suse/
dnsmasq-suse.spec
16
Conflicts
: bind bind8 bind9
/external/icu4c/common/
uprops.h
276
/* #define _Lo FLAG(U_OTHER_LETTER) --
conflicts
with MS Visual Studio 9.0 xiosbase */
292
/* #define _Pe FLAG(U_END_PUNCTUATION) --
conflicts
with MS Visual Studio 9.0 xlocnum */
293
/* #define _Pc FLAG(U_CONNECTOR_PUNCTUATION) --
conflicts
with MS Visual Studio 9.0 streambuf */
300
/* #define _Pf FLAG(U_FINAL_PUNCTUATION) --
conflicts
with MS Visual Studio 9.0 streambuf */
/external/llvm/test/Instrumentation/AddressSanitizer/
asan-vs-gvn.ll
2
; ASAN
conflicts
with load widening iff the widened load accesses data out of bounds
/external/qemu/distrib/sdl-1.2.15/include/
SDL_loadso.h
37
* namespace for the application. If it does and it
conflicts
with
/external/srtp/googlepatches/
google-12-srtp-hide-aes-tables-main.patch
25
+- Make main in tables/aes_tables.c hidable. If it is present, it
conflicts
/external/valgrind/main/helgrind/tests/
free_is_write.stderr.exp
24
This
conflicts
with a previous read of size 1 by thread #x
hg03_inherit.stderr.exp
22
This
conflicts
with a previous read of size 4 by thread #x
/external/wpa_supplicant_8/src/drivers/
driver_ndis_.c
16
* avoid
conflicts
with some of the header files. */
/libcore/luni/src/test/java/tests/org/w3c/dom/
DocumentBuilderSettingStrategy.java
144
// schema validating
conflicts
with namespaceAware
/prebuilts/tools/darwin-x86/sdl/include/SDL/
SDL_loadso.h
37
* namespace for the application. If it does and it
conflicts
with
/prebuilts/tools/linux-x86/sdl/include/SDL/
SDL_loadso.h
37
* namespace for the application. If it does and it
conflicts
with
/prebuilts/tools/windows/sdl/include/SDL/
SDL_loadso.h
37
* namespace for the application. If it does and it
conflicts
with
/external/bison/po/
ja.po
35
#: src/
conflicts
.c:77
40
#: src/
conflicts
.c:86
45
#: src/
conflicts
.c:94
50
#: src/
conflicts
.c:492
52
msgid "
conflicts
: %d shift/reduce, %d reduce/reduce\n"
55
#: src/
conflicts
.c:495
57
msgid "
conflicts
: %d shift/reduce\n"
60
#: src/
conflicts
.c:497
62
msgid "
conflicts
: %d reduce/reduce\n"
65
#: src/
conflicts
.c:51
[
all
...]
ro.po
37
#: src/
conflicts
.c:77
42
#: src/
conflicts
.c:86
48
#: src/
conflicts
.c:94
54
#: src/
conflicts
.c:492
56
msgid "
conflicts
: %d shift/reduce, %d reduce/reduce\n"
59
#: src/
conflicts
.c:495
61
msgid "
conflicts
: %d shift/reduce\n"
64
#: src/
conflicts
.c:497
66
msgid "
conflicts
: %d reduce/reduce\n"
69
#: src/
conflicts
.c:51
[
all
...]
/external/bison/src/
Makefile.am
40
conflicts
.c
conflicts
.h \
/external/chromium_org/chrome/browser/ui/webui/
conflicts_ui.cc
66
source->AddResourcePath("
conflicts
.js", IDR_ABOUT_CONFLICTS_JS);
167
// Set up the about:
conflicts
source.
/external/chromium_org/chrome/common/extensions/api/
sync_file_system.idl
49
// File
conflicts
with remote version and must be resolved manually.
146
//
conflicts
for existing files are automatically resolved next time
/external/chromium_org/gpu/command_buffer/common/
types.h
19
// temporary to avoid
conflicts
with npapi.h.
45
// temporary to avoid
conflicts
with npapi.h.
/external/llvm/
README.android
9
* merge
conflicts
with upstream on those parts.
12
*
conflicts
.
/external/llvm/include/llvm/IR/
ValueSymbolTable.h
107
/// If the inserted name
conflicts
, this renames the value.
112
/// it into the symbol table with the specified name. If it
conflicts
, it
Completed in 1631 milliseconds
1
2
3
4
5
6
7
8
9
10
11
>>