Merge remote-tracking branch 'origin/libreoffice-3-4'
Conflicts: solenv/inc/productversion.mk
This commit is contained in:
@@ -144,6 +144,10 @@ sub generate_lo_piece_blacklist($)
|
|||||||
print BLACKLIST "config.parms\n";
|
print BLACKLIST "config.parms\n";
|
||||||
print BLACKLIST "git-hooks\n";
|
print BLACKLIST "git-hooks\n";
|
||||||
print BLACKLIST "Linux*Env.Set.sh\n";
|
print BLACKLIST "Linux*Env.Set.sh\n";
|
||||||
|
print BLACKLIST "src/tmp*\n";
|
||||||
|
print BLACKLIST "src/fetch.log\n";
|
||||||
|
print BLACKLIST "src/libreoffice-*.tar.bz2\n";
|
||||||
|
print BLACKLIST "src/????????????????????????????????-*\n";
|
||||||
print BLACKLIST "warn\n";
|
print BLACKLIST "warn\n";
|
||||||
|
|
||||||
close BLACKLIST;
|
close BLACKLIST;
|
||||||
|
Reference in New Issue
Block a user