Adding upstream version 1.17~rc2.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
73f740a795
commit
27b84c299b
12 changed files with 126 additions and 100 deletions
2
merge.cc
2
merge.cc
|
@ -471,7 +471,7 @@ int merge_files( const std::vector< std::string > & filenames,
|
|||
if( verbosity >= 1 && file_index.members() > 1 )
|
||||
{
|
||||
std::printf( "Merging member %ld of %ld\n",
|
||||
j + 1, (long)file_index.members() );
|
||||
j + 1, file_index.members() );
|
||||
std::fflush( stdout );
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue