Some more fixes and dependency between bonus<->sql_patches

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index c55771879b30e705c6e692c47b8c5d96fe7519b9..fb1bd746f2a85d30cff1797f2900f39155f9d23f 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -148,6 +148,7 @@ inc/extensions/ext-autoreg.php -text svneol=unset#text/plain
 inc/extensions/ext-bank.php -text svneol=unset#text/plain
 inc/extensions/ext-beg.php -text svneol=unset#text/plain
 inc/extensions/ext-birthday.php -text svneol=unset#text/plain
+inc/extensions/ext-bitcoins.php -text svneol=unset#text/plain
 inc/extensions/ext-bonus.php -text svneol=unset#text/plain
 inc/extensions/ext-booking.php -text svneol=unset#text/plain
 inc/extensions/ext-cache.php -text svneol=unset#text/plain
@@ -211,6 +212,7 @@ inc/extensions/ext-usage.php -text svneol=unset#text/plain
 inc/extensions/ext-user.php -text svneol=unset#text/plain
 inc/extensions/ext-validator.php -text svneol=unset#text/plain
 inc/extensions/ext-wernis.php -text svneol=unset#text/plain
+inc/extensions/ext-yacy.php -text svneol=unset#text/plain
 inc/extensions/ext-yoomedia.php -text svneol=unset#text/plain
 inc/filter-functions.php -text svneol=unset#text/plain
 inc/filters.php -text svneol=unset#text/plain
@@ -347,6 +349,7 @@ inc/loader/.htaccess -text svneol=unset#text/plain
 inc/loader/load- -text svneol=unset#text/plain
 inc/loader/load-admins.php -text svneol=unset#text/plain
 inc/loader/load-config.php -text svneol=unset#text/plain
+inc/loader/load-extension.php -text svneol=unset#text/plain
 inc/loader/load-extensions.php -text svneol=unset#text/plain
 inc/loader/load-filter.php -text svneol=unset#text/plain
 inc/loader/load-imprint.php -text svneol=unset#text/plain
@@ -742,6 +745,7 @@ inc/weekly/.htaccess -text svneol=unset#text/plain
 inc/weekly/weekly_ -text svneol=unset#text/plain
 inc/weekly/weekly_surfbar.php -text svneol=unset#text/plain
 inc/wrapper-functions.php -text svneol=unset#text/plain
+inc/xml-functions.php svneol=native#text/plain
 /index.php -text svneol=unset#text/plain
 /install.php -text svneol=unset#text/plain
 install/menu-de.sql -text
@@ -1385,6 +1389,7 @@ templates/de/html/ext/ext_autoreg.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_bank.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_beg.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_birthday.tpl -text svneol=unset#text/plain
+templates/de/html/ext/ext_bitcoins.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_bonus.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_booking.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_cache.tpl -text svneol=unset#text/plain
@@ -1448,6 +1453,7 @@ templates/de/html/ext/ext_usage.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_user.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_validator.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_wernis.tpl -text svneol=unset#text/plain
+templates/de/html/ext/ext_yacy.tpl -text svneol=unset#text/plain
 templates/de/html/ext/ext_yoomedia.tpl -text svneol=unset#text/plain
 templates/de/html/fatal_errors.tpl -text svneol=unset#text/plain
 templates/de/html/guest/.htaccess -text svneol=unset#text/plain
@@ -1769,6 +1775,14 @@ templates/en/html/mailid/.htaccess -text svneol=unset#text/plain
 templates/en/html/member/.htaccess -text svneol=unset#text/plain
 templates/en/html/register_header.tpl -text svneol=unset#text/plain
 templates/en/html/welcome.tpl -text svneol=unset#text/plain
+templates/xml/.htaccess svneol=native#text/plain
+templates/xml/admin/.htaccess svneol=native#text/plain
+templates/xml/admin/admin_del_do_surfbar_urls.xml -text
+templates/xml/admin/admin_del_show_surfbar_urls.xml -text
+templates/xml/admin/admin_edit_do_surfbar_urls.xml -text
+templates/xml/admin/admin_edit_show_surfbar_urls.xml -text
+templates/xml/admin_data_template.xml -text
+templates/xml/template.xml -text
 theme/business/css/beg.css -text
 theme/business/css/doubler.css -text
 theme/business/css/general.css -text