Home
last modified time | relevance | path

Searched refs:Conflicts (Results 1 – 25 of 43) sorted by relevance

12

/netbsd-src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/
H A Dat91-som60.dtsi54 /* Conflicts with USART2_SCK */
60 /* Conflicts with USB_VBUS */
66 /* Conflicts with USART3_SCK */
72 /* Conflicts with USB_OC */
83 /* Conflicts with USART1_SCK */
89 /* Conflicts with GETH_INT */
H A Dgemini-sl93512r.dts39 /* Conflicts with TVC and extended flash */
/netbsd-src/external/bsd/libevent/dist/
H A Dlibevent_core.pc.in12 Conflicts:
H A Dlibevent_extra.pc.in12 Conflicts:
H A Dlibevent.pc.in12 Conflicts:
H A Dlibevent_pthreads.pc.in12 Conflicts:
H A Dlibevent_openssl.pc.in12 Conflicts:
/netbsd-src/external/bsd/ntp/dist/sntp/libevent/
H A Dlibevent.pc.in12 Conflicts:
H A Dlibevent_openssl.pc.in12 Conflicts:
H A Dlibevent_pthreads.pc.in12 Conflicts:
/netbsd-src/external/apache2/llvm/dist/clang/lib/Basic/
H A DModule.cpp603 for (unsigned I = 0, N = Conflicts.size(); I != N; ++I) { in print()
606 OS << Conflicts[I].Other->getFullModuleName(true); in print()
608 OS.write_escaped(Conflicts[I].Message); in print()
666 for (auto &C : V.M->Conflicts) { in setVisible()
/netbsd-src/external/gpl3/gdb/dist/gnulib/import/extra/
H A Dgitlog-to-changelog345 $rest =~ s/^\s*Conflicts:\n.*//sm;
/netbsd-src/external/apache2/llvm/dist/clang/include/clang/Basic/
H A DModule.h414 std::vector<Conflict> Conflicts; variable
/netbsd-src/external/gpl2/diffutils/dist/doc/
H A Ddiff.info2075 * Marking Conflicts:: Marking conflicts.
2081 File: diff.info, Node: Which Changes, Next: Marking Conflicts, Up: diff3 Merging
2096 Conflicts::).
2124 File: diff.info, Node: Marking Conflicts, Next: Bypassing ed, Prev: Which Changes, Up: diff3 Me…
2126 Marking Conflicts
2198 File: diff.info, Node: Bypassing ed, Next: Merging Incomplete Lines, Prev: Marking Conflicts, U…
3746 Conflicts::.
3760 and third files. *Note Marking Conflicts::. With `-E', an
3786 *Note Marking Conflicts::.
3814 Marking Conflicts::.
[all …]
H A Ddiff.texi2137 * Marking Conflicts:: Marking conflicts.
2160 (@pxref{Marking Conflicts}).
2193 @node Marking Conflicts
2194 @section Marking Conflicts
3900 @xref{Marking Conflicts}.
3915 @xref{Marking Conflicts}.
3943 named @samp{A}, @samp{B} and @samp{C}. @xref{Marking Conflicts}.
3969 @xref{Marking Conflicts}.
/netbsd-src/external/bsd/openldap/dist/doc/rfc/
H A Drfc2926.txt82 3.0 Attribute Name Conflicts .................................... 15
808 3.0 Attribute Name Conflicts
/netbsd-src/external/apache2/llvm/dist/llvm/include/llvm/BinaryFormat/
H A DDwarf.def450 // COMPAQ/HP Conflicts with MIPS/HP 0x2001 - 0x2005
/netbsd-src/external/apache2/llvm/dist/clang/lib/Lex/
H A DModuleMap.cpp1335 Mod->Conflicts.push_back(Conflict); in resolveConflicts()
/netbsd-src/external/bsd/file/dist/magic/magdir/
H A Dapple372 # XXX Conflicts with ELF
/netbsd-src/external/mpl/dhcp/dist/doc/
H A DReferences.txt832 Domain Name (FQDN) Conflicts among Dynamic Host
/netbsd-src/external/bsd/openldap/dist/doc/drafts/
H A Ddraft-howard-rfc2307bis-xx.txt1029 Conflicts in naming conventions may arise in other deployments as
/netbsd-src/external/gpl2/xcvs/dist/doc/
H A DChangeLog2967 * cvs.texinfo (Conflicts example): Adjust text and comments
3995 * cvs.texinfo (Conflicts example): Use @asis in example to prevent
4457 * cvs.texinfo (Conflicts example): Describe the "feature" by which
4464 (update output): Refer user to Conflicts example node. Add
H A Dcvs.texinfo1586 written with conflict markers (@pxref{Conflicts example}).
4626 new revision. @xref{Conflicts example}.
6069 * Conflicts example:: An informative example
6164 resolve the conflict as described in @ref{Conflicts example}.
6281 @node Conflicts example
6282 @section Conflicts example
6363 @cindex Conflicts (merge example)
7598 merged onto the main trunk. Conflicts often result
7749 the merge they should be resolved in the normal way (@pxref{Conflicts
11992 @ref{Conflicts example}.
[all …]
/netbsd-src/external/bsd/ipf/dist/
H A DHISTORY1789 Conflicts occur when "general" filter rules are used for ports and the
/netbsd-src/external/apache2/llvm/dist/clang/docs/
H A DModules.rst969 module Conflicts {

12