Removed method re-added. Warning added to config-hubmaster.php

[core.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 0544e367de833fc5c18e05e1c1120a78b4906ec9..f7c63ef4f8367eb9861ea0dd10218a3f627d4d06 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -472,33 +472,12 @@ inc/classes/third_party/php_mailer/class.pop3.php -text
 inc/classes/third_party/php_mailer/class.smtp.php -text
 inc/classes/third_party/php_mailer/docs/extending.html -text
 inc/classes/third_party/php_mailer/docs/faq.html -text
-inc/classes/third_party/php_mailer/docs/pop3_article.txt -text
-inc/classes/third_party/php_mailer/docs/use_gmail.txt -text
 inc/classes/third_party/php_mailer/examples/contents.html -text
 inc/classes/third_party/php_mailer/examples/images/bkgrnd.gif -text
 inc/classes/third_party/php_mailer/examples/images/phpmailer.gif -text
-inc/classes/third_party/php_mailer/examples/images/phpmailer.png -text
+inc/classes/third_party/php_mailer/examples/images/phpmailer.png -text svneol=unset#image/png
 inc/classes/third_party/php_mailer/examples/images/phpmailer_mini.gif -text
 inc/classes/third_party/php_mailer/examples/index.html -text
-inc/classes/third_party/php_mailer/examples/pop3_before_smtp_test.php -text
-inc/classes/third_party/php_mailer/examples/test_gmail.php -text
-inc/classes/third_party/php_mailer/examples/test_mail.php -text
-inc/classes/third_party/php_mailer/examples/test_sendmail.php -text
-inc/classes/third_party/php_mailer/examples/test_smtp.php -text
-inc/classes/third_party/php_mailer/language/.htaccess -text
-inc/classes/third_party/php_mailer/language/phpmailer.lang-br.php -text
-inc/classes/third_party/php_mailer/language/phpmailer.lang-ca.php -text
-inc/classes/third_party/php_mailer/language/phpmailer.lang-cz.php -text
-inc/classes/third_party/php_mailer/language/phpmailer.lang-de.php -text
-inc/classes/third_party/php_mailer/language/phpmailer.lang-dk.php -text
-inc/classes/third_party/php_mailer/language/phpmailer.lang-en.php -text
-inc/classes/third_party/php_mailer/language/phpmailer.lang-es.php -text
-inc/classes/third_party/php_mailer/language/phpmailer.lang-et.php -text
-inc/classes/third_party/php_mailer/language/phpmailer.lang-fi.php -text
-inc/classes/third_party/php_mailer/language/phpmailer.lang-fo.php -text
-inc/classes/third_party/php_mailer/language/phpmailer.lang-fr.php -text
-inc/classes/third_party/php_mailer/language/phpmailer.lang-hu.php -text
-inc/classes/third_party/php_mailer/language/phpmailer.lang-it.php -text
 inc/classes/third_party/php_mailer/language/phpmailer.lang-ja.php -text
 inc/classes/third_party/php_mailer/language/phpmailer.lang-nl.php -text
 inc/classes/third_party/php_mailer/language/phpmailer.lang-no.php -text
@@ -507,20 +486,6 @@ inc/classes/third_party/php_mailer/language/phpmailer.lang-ro.php -text
 inc/classes/third_party/php_mailer/language/phpmailer.lang-ru.php -text
 inc/classes/third_party/php_mailer/language/phpmailer.lang-se.php -text
 inc/classes/third_party/php_mailer/language/phpmailer.lang-tr.php -text
-inc/classes/third_party/php_mailer/phpdoc/PHPMailer/PHPMailer.html -text
-inc/classes/third_party/php_mailer/phpdoc/PHPMailer/SMTP.html -text
-inc/classes/third_party/php_mailer/phpdoc/PHPMailer/_class_phpmailer_php.html -text
-inc/classes/third_party/php_mailer/phpdoc/PHPMailer/_class_smtp_php.html -text
-inc/classes/third_party/php_mailer/phpdoc/blank.html -text
-inc/classes/third_party/php_mailer/phpdoc/classtrees_PHPMailer.html -text
-inc/classes/third_party/php_mailer/phpdoc/elementindex.html -text
-inc/classes/third_party/php_mailer/phpdoc/elementindex_PHPMailer.html -text
-inc/classes/third_party/php_mailer/phpdoc/errors.html -text
-inc/classes/third_party/php_mailer/phpdoc/index.html -text
-inc/classes/third_party/php_mailer/phpdoc/li_PHPMailer.html -text
-inc/classes/third_party/php_mailer/phpdoc/media/banner.css -text
-inc/classes/third_party/php_mailer/phpdoc/media/stylesheet.css -text
-inc/classes/third_party/php_mailer/phpdoc/packages.html -text
 inc/classes/third_party/php_mailer/test/phpmailer_test.php -text
 inc/classes/third_party/php_mailer/test/phpunit.php -text
 inc/classes/third_party/php_mailer/test/test.png -text