Misc fixes / improves

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 247c935f3d45c651bdbac07e09f163dd0325b12f..3f95216a6554f942410a885971b304bbe1f26649 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -103,6 +103,7 @@ inc/cache/_compiled/html/.htaccess -text
 inc/classes/.htaccess -text
 inc/classes/cachesystem.class.php -text
 inc/classes/rdf.class.php -text
+inc/classes/resolver.class.php -text
 inc/config-functions.php -text
 inc/config-global.php -text
 inc/config-local.php.dist -text
@@ -563,6 +564,7 @@ inc/modules/member/what-refback.php -text
 inc/modules/member/what-reflinks.php -text
 inc/modules/member/what-reflist.php -text
 inc/modules/member/what-sponsor.php -text
+inc/modules/member/what-sponsor_list.php -text
 inc/modules/member/what-stats.php -text
 inc/modules/member/what-support.php -text
 inc/modules/member/what-surfbar_book.php -text
@@ -613,8 +615,10 @@ inc/phpmailer/examples/test_gmail.php -text
 inc/phpmailer/examples/test_mail.php -text
 inc/phpmailer/examples/test_sendmail.php -text
 inc/phpmailer/examples/test_smtp.php -text
+inc/phpmailer/language/phpmailer.lang-ar.php -text
 inc/phpmailer/language/phpmailer.lang-br.php -text
 inc/phpmailer/language/phpmailer.lang-ca.php -text
+inc/phpmailer/language/phpmailer.lang-ch.php -text
 inc/phpmailer/language/phpmailer.lang-cz.php -text
 inc/phpmailer/language/phpmailer.lang-de.php -text
 inc/phpmailer/language/phpmailer.lang-de.zip -text
@@ -627,7 +631,7 @@ inc/phpmailer/language/phpmailer.lang-fo.php -text
 inc/phpmailer/language/phpmailer.lang-fr.php -text
 inc/phpmailer/language/phpmailer.lang-hu.php -text
 inc/phpmailer/language/phpmailer.lang-it.php -text
-inc/phpmailer/language/phpmailer.lang-ja.php -text
+inc/phpmailer/language/phpmailer.lang-ja.php -text svneol=unset#application/octet-stream
 inc/phpmailer/language/phpmailer.lang-nl.php -text
 inc/phpmailer/language/phpmailer.lang-no.php -text
 inc/phpmailer/language/phpmailer.lang-pl.php -text
@@ -635,6 +639,8 @@ inc/phpmailer/language/phpmailer.lang-ro.php -text
 inc/phpmailer/language/phpmailer.lang-ru.php -text
 inc/phpmailer/language/phpmailer.lang-se.php -text
 inc/phpmailer/language/phpmailer.lang-tr.php -text
+inc/phpmailer/language/phpmailer.lang-zh.php -text
+inc/phpmailer/language/phpmailer.lang-zh_cn.php -text
 inc/phpmailer/phpdoc/PHPMailer/PHPMailer.html -text
 inc/phpmailer/phpdoc/PHPMailer/SMTP.html -text
 inc/phpmailer/phpdoc/PHPMailer/_class_phpmailer_php.html -text