From: Mark Andrews <marka@isc.org>
Date: Thu, 27 Aug 2015 23:55:00 +0000 (+0000)
Subject: add support for .gitattributes
X-Git-Tag: v9.11.0a1~514
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=6376f6189950156cc1488c86f22b19dd4feec11c;p=thirdparty%2Fbind9.git

add support for .gitattributes
---

diff --git a/util/merge_copyrights b/util/merge_copyrights
index b66a7090b23..b216257bd9a 100644
--- a/util/merge_copyrights
+++ b/util/merge_copyrights
@@ -104,7 +104,7 @@ while (<CHANGES>) {
 	    $file_types{$_} = "ZONE";
 	} elsif ($base =~ /\.mkd$/) {
 	    $file_types{$_} = "MKD";
-	} elsif ($base =~ /(\/\.gitignore|Atffile|\.(gif|jpg))$/i) {
+	} elsif ($base =~ /(\/\.(gitignore|gitattributes)|Atffile|\.(gif|jpg))$/i) {
 	    $file_types{$_} = "X";
 	} elsif ($base =~ /\.(def|dep|dsp|dsw|mak|sln)$/i) {
 	    $file_types{$_} = "X";