Extensions bitcoins/yacy added, new API functions for handling proxy/non-proxy added:

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 9b1ed309e005f7f45273b4b56cbbca8c1a7c6ab1..6f9071e46e99b865eb562aa62dd5fa69a662a6ee 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -30,6 +30,7 @@ DOCS/de/country/countries-full.sql -text
 DOCS/de/country/countries-sorted.sql -text
 DOCS/de/doubler/README.txt -text svneol=unset#text/plain
 DOCS/de/engine/README.txt -text svneol=unset#text/plain
+DOCS/de/forced/Tabellenlayout.txt svneol=native#text/plain
 DOCS/de/network/README.txt -text svneol=unset#text/plain
 DOCS/de/promoter.txt -text svneol=unset#text/plain
 DOCS/de/rallye/README.txt -text svneol=unset#text/plain
@@ -110,6 +111,20 @@ inc/code-functions.php svneol=native#text/plain
 inc/config-functions.php -text svneol=unset#text/plain
 inc/config-global.php -text svneol=unset#text/plain
 inc/config-local.php.dist -text
+inc/daily/.htaccess svneol=native#text/plain
+inc/daily/daily_ -text
+inc/daily/daily_100_bonus.php svneol=native#text/plain
+inc/daily/daily_autopurge.php svneol=native#text/plain
+inc/daily/daily_beg.php svneol=native#text/plain
+inc/daily/daily_birthday.php svneol=native#text/plain
+inc/daily/daily_bonus.php svneol=native#text/plain
+inc/daily/daily_doubler.php svneol=native#text/plain
+inc/daily/daily_engine.php svneol=native#text/plain
+inc/daily/daily_holiday.php svneol=native#text/plain
+inc/daily/daily_profile.php svneol=native#text/plain
+inc/daily/daily_surfbar.php svneol=native#text/plain
+inc/daily/daily_user.php svneol=native#text/plain
+inc/daily/daily_yoomedia.php svneol=native#text/plain
 inc/databases.php -text svneol=unset#text/plain
 inc/db/.htaccess -text svneol=unset#text/plain
 inc/db/lib-mysql3.php -text svneol=unset#text/plain
@@ -133,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
@@ -196,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
@@ -329,6 +346,18 @@ inc/libs/yoomedia_functions.php -text svneol=unset#text/plain
 inc/load_cache.php -text svneol=unset#text/plain
 inc/load_config.php -text svneol=unset#text/plain
 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
+inc/loader/load-modules.php -text svneol=unset#text/plain
+inc/loader/load-refdepths.php -text svneol=unset#text/plain
+inc/loader/load-refsystem.php -text svneol=unset#text/plain
+inc/loader/load-revision.php svneol=native#text/plain
+inc/loader/load-themes.php -text svneol=unset#text/plain
 inc/loader/load_cache- -text svneol=unset#text/plain
 inc/loader/load_cache-admin.php -text svneol=unset#text/plain
 inc/loader/load_cache-config.php -text svneol=unset#text/plain
@@ -1359,6 +1388,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
@@ -1422,6 +1452,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