Some reverts/fixes

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index aef2420b65d9c9c67986d73f2d9fdb7f09dd4948..2acb04059b3b71b4b943cf3ea2ad6dbef8baccca 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,9 +1,11 @@
 * text=auto !eol
 /.htaccess svneol=native#text/plain
+DOCS/.htaccess svneol=native#text/plain
 DOCS/INSTALL.txt svneol=native#text/plain
 DOCS/JQUERY-AUTHORS.txt svneol=native#text/plain
 DOCS/LICENSE-GPL2.txt svneol=native#text/plain
 DOCS/TODOs.txt svneol=native#text/plain
+DOCS/de/.htaccess svneol=native#text/plain
 DOCS/de/AUTHORS.txt svneol=native#text/plain
 DOCS/de/CHANGES.txt svneol=native#text/plain
 DOCS/de/CSS-PATCHES.txt svneol=native#text/plain
@@ -21,19 +23,32 @@ DOCS/de/THANK_YOU.txt svneol=native#text/plain
 DOCS/de/TODO.txt svneol=native#text/plain
 DOCS/de/TRANSLATORS.txt svneol=native#text/plain
 DOCS/de/UPGRADING.txt svneol=native#text/plain
+DOCS/de/autoreg/.htaccess svneol=native#text/plain
 DOCS/de/autoreg/README.txt svneol=native#text/plain
+DOCS/de/cache/.htaccess svneol=native#text/plain
 DOCS/de/cache/README.txt svneol=native#text/plain
+DOCS/de/country/.htaccess svneol=native#text/plain
 DOCS/de/country/README.txt svneol=native#text/plain
+DOCS/de/doubler/.htaccess svneol=native#text/plain
 DOCS/de/doubler/README.txt svneol=native#text/plain
+DOCS/de/engine/.htaccess svneol=native#text/plain
 DOCS/de/engine/README.txt svneol=native#text/plain
+DOCS/de/forced/.htaccess svneol=native#text/plain
 DOCS/de/forced/Tabellenlayout.txt svneol=native#text/plain
+DOCS/de/network/.htaccess svneol=native#text/plain
 DOCS/de/network/README.txt svneol=native#text/plain
+DOCS/de/rallye/.htaccess svneol=native#text/plain
 DOCS/de/rallye/README.txt svneol=native#text/plain
 DOCS/de/rewrite/.htaccess svneol=native#text/plain
 DOCS/de/rewrite/README.txt svneol=native#text/plain
+DOCS/de/surfbar/.htaccess svneol=native#text/plain
 DOCS/de/surfbar/README.txt svneol=native#text/plain
 DOCS/de/surfbar/README_surfbar.txt svneol=native#text/plain
+DOCS/de/task/.htaccess svneol=native#text/plain
+DOCS/de/themes/.htaccess svneol=native#text/plain
 DOCS/de/themes/README.txt svneol=native#text/plain
+DOCS/doxygen/.htaccess svneol=native#text/plain
+DOCS/en/.htaccess svneol=native#text/plain
 DOCS/en/AUTHORS.txt svneol=native#text/plain
 DOCS/en/CHANGES.txt svneol=native#text/plain
 DOCS/en/CSS-PATCHES.txt svneol=native#text/plain
@@ -51,15 +66,22 @@ DOCS/en/THANK_YOU.txt svneol=native#text/plain
 DOCS/en/TODO.txt svneol=native#text/plain
 DOCS/en/TRANSLATORS.txt svneol=native#text/plain
 DOCS/en/UPGRADING.txt svneol=native#text/plain
+DOCS/en/cache/.htaccess svneol=native#text/plain
 DOCS/en/cache/README.txt svneol=native#text/plain
+DOCS/en/country/.htaccess svneol=native#text/plain
 DOCS/en/country/README.txt svneol=native#text/plain
+DOCS/en/doubler/.htaccess svneol=native#text/plain
 DOCS/en/doubler/README.txt svneol=native#text/plain
+DOCS/en/engine/.htaccess svneol=native#text/plain
 DOCS/en/engine/README.txt svneol=native#text/plain
 DOCS/en/promoter.txt svneol=native#text/plain
+DOCS/en/rallye/.htaccess svneol=native#text/plain
 DOCS/en/rallye/README.txt svneol=native#text/plain
 DOCS/en/rewrite/.htaccess svneol=native#text/plain
 DOCS/en/rewrite/README.txt svneol=native#text/plain
+DOCS/en/task/.htaccess svneol=native#text/plain
 DOCS/en/task/README.txt svneol=native#text/plain
+DOCS/en/themes/.htaccess svneol=native#text/plain
 DOCS/en/themes/README.txt svneol=native#text/plain
 DOCS/geoip_LICENSE.txt svneol=native#text/plain
 DOCS/jquery-license.txt svneol=native#text/plain
@@ -142,6 +164,7 @@ inc/extensions/ext-active.php svneol=native#text/plain
 inc/extensions/ext-admins.php svneol=native#text/plain
 inc/extensions/ext-admintheme1.php svneol=native#text/plain
 inc/extensions/ext-admintheme_default.php svneol=native#text/plain
+inc/extensions/ext-alert.php svneol=native#text/plain
 inc/extensions/ext-announcement.php svneol=native#text/plain
 inc/extensions/ext-autopurge.php svneol=native#text/plain
 inc/extensions/ext-autoreg.php svneol=native#text/plain
@@ -234,6 +257,7 @@ inc/filter/coupon_filter.php svneol=native#text/plain
 inc/filter/earning_filter.php svneol=native#text/plain
 inc/filter/forced_filter.php svneol=native#text/plain
 inc/filter/mediadata_filter.php svneol=native#text/plain
+inc/filter/menu_filter.php svneol=native#text/plain
 inc/filter/online_filter.php svneol=native#text/plain
 inc/filter/order_filter.php svneol=native#text/plain
 inc/filter/other_filter.php svneol=native#text/plain
@@ -1660,6 +1684,7 @@ templates/de/html/admin/admin_welcome.tpl svneol=native#text/plain
 templates/de/html/admin/admin_welcome_admins.tpl svneol=native#text/plain
 templates/de/html/admin/admin_yoomedia_error.tpl svneol=native#text/plain
 templates/de/html/agb.tpl svneol=native#text/plain
+templates/de/html/ajax_app_exit_message.tpl svneol=native#text/plain
 templates/de/html/ajax_test_passed.tpl svneol=native#text/plain
 templates/de/html/app_exit_message.tpl svneol=native#text/plain
 templates/de/html/beg/.htaccess svneol=native#text/plain
@@ -1678,6 +1703,7 @@ templates/de/html/birthday/birthday_msg.tpl svneol=native#text/plain
 templates/de/html/copyright.tpl svneol=native#text/plain
 templates/de/html/copyright_backlink.tpl svneol=native#text/plain
 templates/de/html/css_inline.tpl svneol=native#text/plain
+templates/de/html/display_email.tpl svneol=native#text/plain
 templates/de/html/doubler/.htaccess svneol=native#text/plain
 templates/de/html/doubler/doubler_banner.tpl svneol=native#text/plain
 templates/de/html/doubler/doubler_footer.tpl svneol=native#text/plain
@@ -1690,6 +1716,7 @@ templates/de/html/ext/ext_active.tpl svneol=native#text/plain
 templates/de/html/ext/ext_admins.tpl svneol=native#text/plain
 templates/de/html/ext/ext_admintheme1.tpl svneol=native#text/plain
 templates/de/html/ext/ext_admintheme_default.tpl svneol=native#text/plain
+templates/de/html/ext/ext_alert.tpl svneol=native#text/plain
 templates/de/html/ext/ext_announcement.tpl svneol=native#text/plain
 templates/de/html/ext/ext_autopurge.tpl svneol=native#text/plain
 templates/de/html/ext/ext_autoreg.tpl svneol=native#text/plain
@@ -1834,6 +1861,7 @@ templates/de/html/guest/guest_top10_empty5.tpl svneol=native#text/plain
 templates/de/html/guest/guest_top10_row_earner.tpl svneol=native#text/plain
 templates/de/html/guest/guest_top10_row_login.tpl svneol=native#text/plain
 templates/de/html/guest/guest_top10_row_refs.tpl svneol=native#text/plain
+templates/de/html/guest/guest_wernis_news.tpl svneol=native#text/plain
 templates/de/html/impressum.tpl svneol=native#text/plain
 templates/de/html/index.tpl svneol=native#text/plain
 templates/de/html/index_forward.tpl svneol=native#text/plain
@@ -1845,9 +1873,12 @@ templates/de/html/install/install_fatal_table.tpl svneol=native#text/plain
 templates/de/html/install/install_finished.tpl svneol=native#text/plain
 templates/de/html/install/install_footer.tpl svneol=native#text/plain
 templates/de/html/install/install_header.tpl svneol=native#text/plain
+templates/de/html/install/install_list_extensions.tpl svneol=native#text/plain
+templates/de/html/install/install_list_extensions_row.tpl svneol=native#text/plain
 templates/de/html/install/install_main_ajax.tpl svneol=native#text/plain
 templates/de/html/install/install_main_plain.tpl svneol=native#text/plain
 templates/de/html/install/install_menu.tpl svneol=native#text/plain
+templates/de/html/install/install_metadata.tpl svneol=native#text/plain
 templates/de/html/install/install_overview_failed.tpl svneol=native#text/plain
 templates/de/html/install/install_page1.tpl svneol=native#text/plain
 templates/de/html/install/install_page2.tpl svneol=native#text/plain
@@ -1855,6 +1886,7 @@ templates/de/html/install/install_page3.tpl svneol=native#text/plain
 templates/de/html/install/install_page5.tpl svneol=native#text/plain
 templates/de/html/install/install_page_base_data.tpl svneol=native#text/plain
 templates/de/html/install/install_page_database_config.tpl svneol=native#text/plain
+templates/de/html/install/install_page_extensions.tpl svneol=native#text/plain
 templates/de/html/install/install_page_init.tpl svneol=native#text/plain
 templates/de/html/install/install_page_other_config.tpl svneol=native#text/plain
 templates/de/html/install/install_page_overview.tpl svneol=native#text/plain
@@ -1955,6 +1987,12 @@ templates/de/html/member/member_list_surfbar.tpl svneol=native#text/plain
 templates/de/html/member/member_list_surfbar_form.tpl svneol=native#text/plain
 templates/de/html/member/member_list_surfbar_row.tpl svneol=native#text/plain
 templates/de/html/member/member_list_surfbar_table.tpl svneol=native#text/plain
+templates/de/html/member/member_list_unconfirmed.tpl svneol=native#text/plain
+templates/de/html/member/member_list_unconfirmed_404_row.tpl svneol=native#text/plain
+templates/de/html/member/member_list_unconfirmed_nopoints.tpl svneol=native#text/plain
+templates/de/html/member/member_list_unconfirmed_nopoints_404_row.tpl svneol=native#text/plain
+templates/de/html/member/member_list_unconfirmed_nopoints_row.tpl svneol=native#text/plain
+templates/de/html/member/member_list_unconfirmed_row.tpl svneol=native#text/plain
 templates/de/html/member/member_list_user_subids.tpl svneol=native#text/plain
 templates/de/html/member/member_list_user_subids_row.tpl svneol=native#text/plain
 templates/de/html/member/member_login_js.tpl svneol=native#text/plain
@@ -1972,6 +2010,7 @@ templates/de/html/member/member_menu_bottom.tpl svneol=native#text/plain
 templates/de/html/member/member_menu_row.tpl svneol=native#text/plain
 templates/de/html/member/member_menu_start.tpl svneol=native#text/plain
 templates/de/html/member/member_menu_title.tpl svneol=native#text/plain
+templates/de/html/member/member_metadata.tpl svneol=native#text/plain
 templates/de/html/member/member_mydata_button.tpl svneol=native#text/plain
 templates/de/html/member/member_mydata_edit.tpl svneol=native#text/plain
 templates/de/html/member/member_mydata_overview.tpl svneol=native#text/plain
@@ -2064,6 +2103,7 @@ templates/de/html/menu/menu_what_begin.tpl svneol=native#text/plain
 templates/de/html/menu/menu_what_end.tpl svneol=native#text/plain
 templates/de/html/message.tpl svneol=native#text/plain
 templates/de/html/metadata.tpl svneol=native#text/plain
+templates/de/html/noindex_metadata.tpl svneol=native#text/plain
 templates/de/html/online_now.tpl svneol=native#text/plain
 templates/de/html/page_body.tpl svneol=native#text/plain
 templates/de/html/page_footer.tpl svneol=native#text/plain