5.5 merge

This commit is contained in:
Sergei Golubchik 2014-05-09 12:35:11 +02:00
commit d3e2e1243b
1865 changed files with 92783 additions and 80381 deletions

View file

@ -500,6 +500,7 @@ static void find_tool(char *tool_executable_name, const char *tool_name,
*/
if (run_tool(tool_executable_name,
&ds_tmp, /* Get output from command, discard*/
"--no-defaults",
"--help",
"2>&1",
IF_WIN("> NUL", "> /dev/null"),