Home
last modified time | relevance | path

Searched refs:ours (Results 1 – 25 of 60) sorted by relevance

123

/external/webkit/Tools/Scripts/
Dresolve-ChangeLogs131 my ($base, $theirs, $ours) = @ARGV;
132 if (mergeChangeLogs($ours, $base, $theirs)) {
133 unlink($ours);
134 copy($theirs, $ours) or die $!;
136 exec qw(git merge-file -L THEIRS -L BASE -L OURS), $theirs, $base, $ours;
/external/chromium/third_party/libjingle/source/talk/session/phone/
Dmediasessionclient.cc267 for (AudioCodecs::const_iterator ours = audio_codecs.begin(); in CreateAnswer() local
268 ours != audio_codecs.end(); ++ours) { in CreateAnswer()
271 if (ours->Matches(*theirs)) { in CreateAnswer()
272 AudioCodec negotiated(*ours); in CreateAnswer()
303 for (VideoCodecs::const_iterator ours = video_codecs.begin(); in CreateAnswer() local
304 ours != video_codecs.end(); ++ours) { in CreateAnswer()
307 if (ours->Matches(*theirs)) { in CreateAnswer()
308 VideoCodec negotiated(*ours); in CreateAnswer()
/external/bison/m4/
Dmbswidth.m416 dnl that clashes with ours.
/external/llvm/docs/HistoricalNotes/
D2001-02-06-TypeNotationDebateResp4.txt11 different than ours. He was in a position where he was designing a high
/external/webkit/LayoutTests/platform/android/
Dtest_expectations.txt126 …ing in the file due to multiple input boxes fitting on one line on Apple, ours are wrapped. Space …
136 …ing in the file due to multiple frame boxes fitting on one line on Apple, ours are wrapped. Space …
/external/dnsmasq/contrib/dnslist/
Ddnslist.pl311 Also, for each author's protection and ours, we want to make certain
/external/icu4c/samples/ufortune/resources/
Droot.txt120 enlightened him with ours.",
/external/svox/pico_resources/tools/LingwareBuilding/PicoLingware_source_files/pkb/en-GB/
Den-GB_klex.pkb1012 ;!3)&IO5Pought2-K oughtn't2-KEKoui#O!@our(6&Iours-!6&IPourself -"6&IJ!:C=
/external/quake/quake/src/
Dgnu.txt20 Also, for each author's protection and ours, we want to make certain that everyone understands that…
/external/chromium/third_party/libjingle/
Dmods-since-v0_4_0.diff18 < |-third_party - Components that aren't ours
58 > |-third_party - Components that aren't ours
/external/quake/
DNOTICE59 Also, for each author's protection and ours, we want to make certain
399 Also, for each author's protection and ours, we want to make certain
/external/chromium/net/tools/spdyshark/
DCOPYING43 Also, for each author's protection and ours, we want to make certain
/external/valgrind/main/VEX/
DLICENSE.GPL43 Also, for each author's protection and ours, we want to make certain
/external/iproute2/tc/
DNOTICE43 Also, for each author's protection and ours, we want to make certain
/external/gcc-demangle/
DCOPYING43 Also, for each author's protection and ours, we want to make certain
/external/libcap-ng/
DNOTICE43 Also, for each author's protection and ours, we want to make certain
/external/libpng/contrib/gregbook/
DCOPYING43 Also, for each author's protection and ours, we want to make certain
/external/iproute2/ip/
DNOTICE43 Also, for each author's protection and ours, we want to make certain
/external/libcap-ng/libcap-ng-0.7/
DCOPYING43 Also, for each author's protection and ours, we want to make certain
/external/blktrace/btt/
DNOTICE49 Also, for each author's protection and ours, we want to make certain
/external/blktrace/
DLICENSE43 Also, for each author's protection and ours, we want to make certain
/external/eigen/bench/btl/
DCOPYING43 Also, for each author's protection and ours, we want to make certain
/external/iproute2/lib/
DNOTICE43 Also, for each author's protection and ours, we want to make certain
/external/dnsmasq/
DCOPYING43 Also, for each author's protection and ours, we want to make certain
/external/oprofile/
DCOPYING43 Also, for each author's protection and ours, we want to make certain

123