HomeSort by relevance Sort by last modified time
    Searched refs:conflictedChangeLogs (Results 1 - 2 of 2) sorted by null

  /external/webkit/Tools/Scripts/
update-webkit 120 my @conflictedChangeLogs;
126 push @conflictedChangeLogs, $filename if basename($filename) eq "ChangeLog";
131 if (@conflictedChangeLogs) {
134 (system($resolveChangeLogsPath, "--no-warnings", @conflictedChangeLogs) == 0)
prepare-ChangeLog 350 my @conflictedChangeLogs;
353 push @conflictedChangeLogs, $1 if $line =~ m/^C\s+(.+?)[\r\n]*$/;
357 if (@conflictedChangeLogs) {
360 open RESOLVE, "-|", $resolveChangeLogsPath, "--no-warnings", @conflictedChangeLogs
    [all...]

Completed in 576 milliseconds