Merge branch 'contrib' into 0.2.1-FINAL

[mailer.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index bff10907146de00b3eee603829366c999db473be..1be37be1675ae5d45bd5e6ef3b51fdf147cce17a 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -101,6 +101,54 @@ DOCS/tpl-validator.php svneol=native#text/plain
 /debug.php svneol=native#text/plain
 /doubler.php svneol=native#text/plain
 /img.php svneol=native#text/plain
+contrib/autoreg_output.php svneol=native#text/plain
+contrib/autoreg_test.php -text svneol=unset#text/plain
+contrib/captcha-base.xcf -text svneol=unset#application/x-xcf
+contrib/code_swarm/README -text
+contrib/code_swarm/mailer.config -text
+contrib/code_swarm/mailer.sh svneol=native#text/plain
+contrib/debug-lines.sh svneol=native#text/plain
+contrib/ext-partner/earnstar-datenimport.pdf -text svneol=unset#application/pdf
+contrib/final-checker.sh svneol=native#text/plain
+contrib/get_Global.php -text svneol=unset#text/plain
+contrib/ideas/000-README.txt svneol=native#text/plain
+contrib/ideas/ext-affiliate.php svneol=native#text/plain
+contrib/ideas/ext-club.php svneol=native#text/plain
+contrib/ideas/ext-coupon.php svneol=native#text/plain
+contrib/ideas/ext-digit.php svneol=native#text/plain
+contrib/ideas/ext-engine.php svneol=native#text/plain
+contrib/ideas/ext-refund.php svneol=native#text/plain
+contrib/ideas/ext-shop.php svneol=native#text/plain
+contrib/ideas/ext-shredder.php svneol=native#text/plain
+contrib/ideas/ext-signup.php svneol=native#text/plain
+contrib/ideas/ext_coupon.tpl svneol=native#text/plain
+contrib/ideas/ext_signup.tpl svneol=native#text/plain
+contrib/install_svn.php svneol=native#text/plain
+contrib/interface_test.php -text svneol=unset#text/plain
+contrib/lint.sh svneol=native#text/plain
+contrib/merge-exp.sh svneol=native#text/plain
+contrib/mt_konverter/AENDERUNGEN.txt svneol=native#text/plain
+contrib/mt_konverter/INHALT.txt svneol=native#text/plain
+contrib/mt_konverter/Lizenzdatei.txt svneol=native#text/plain
+contrib/mt_konverter/mt_mxchange_converter.php svneol=native#text/plain
+contrib/mt_konverter/readme_konverter.txt svneol=native#text/plain
+contrib/patch_core.sh svneol=native#text/plain
+contrib/prop-set.sh svneol=native#text/plain
+contrib/remove-deprecated.sh svneol=native#text/plain
+contrib/teaser.txt svneol=native#text/plain
+contrib/todo-builder.sh svneol=native#text/plain
+contrib/updater/.cmds.sh svneol=native#text/plain
+contrib/updater/.cms.sh svneol=native#text/plain
+contrib/updater/.config.sh svneol=native#text/plain
+contrib/updater/.cvs.sh svneol=native#text/plain
+contrib/updater/.extensions.sh svneol=native#text/plain
+contrib/updater/.ftp.sh svneol=native#text/plain
+contrib/updater/.functions.sh svneol=native#text/plain
+contrib/updater/.hp.sh svneol=native#text/plain
+contrib/updater/.themes.sh svneol=native#text/plain
+contrib/updater/LICENSE -text
+contrib/updater/cvs-updater.sh svneol=native#text/plain
+contrib/validator.sh svneol=native#text/plain
 img/captcha-error.png -text svneol=unset#image/png
 img/politician-stop/politiker-stopp-print-kopf.png -text svneol=unset#image/png
 img/politician-stop/politiker-stopp_150x24.png -text svneol=unset#image/png
@@ -148,6 +196,7 @@ inc/daily/daily_yoomedia.php svneol=native#text/plain
 inc/databases.php svneol=native#text/plain
 inc/db/.htaccess svneol=native#text/plain
 inc/db/lib-mysql3.php svneol=native#text/plain
+inc/db/lib-mysqli.php svneol=native#text/plain
 inc/db/lib.php svneol=native#text/plain
 inc/debug/.htaccess svneol=native#text/plain
 inc/debug/client/.htaccess svneol=native#text/plain
@@ -294,6 +343,8 @@ inc/extensions/user/.htaccess svneol=native#text/plain
 inc/extensions/user/mode-remove.php svneol=native#text/plain
 inc/extensions/user/mode-setup.php svneol=native#text/plain
 inc/extensions/user/mode-update.php svneol=native#text/plain
+inc/extensions/wernis/.htaccess svneol=native#text/plain
+inc/extensions/wernis/mode-update.php svneol=native#text/plain
 inc/filter-functions.php svneol=native#text/plain
 inc/filter/.htaccess svneol=native#text/plain
 inc/filter/_filter.php svneol=native#text/plain
@@ -326,6 +377,7 @@ inc/filter/timezone_filter.php svneol=native#text/plain
 inc/filter/transaction_filter.php svneol=native#text/plain
 inc/filter/uberwach_filter.php svneol=native#text/plain
 inc/filter/user_filter.php svneol=native#text/plain
+inc/filter/wernis_filter.php svneol=native#text/plain
 inc/filters.php svneol=native#text/plain
 inc/fix_filters.php svneol=native#text/plain
 inc/fix_menu.php svneol=native#text/plain
@@ -651,6 +703,7 @@ inc/modules/admin/what-list_grade_data.php svneol=native#text/plain
 inc/modules/admin/what-list_holiday.php svneol=native#text/plain
 inc/modules/admin/what-list_links.php svneol=native#text/plain
 inc/modules/admin/what-list_mods.php svneol=native#text/plain
+inc/modules/admin/what-list_network_api.php svneol=native#text/plain
 inc/modules/admin/what-list_network_array_translation.php svneol=native#text/plain
 inc/modules/admin/what-list_network_data.php svneol=native#text/plain
 inc/modules/admin/what-list_network_request_params.php svneol=native#text/plain
@@ -1427,6 +1480,7 @@ templates/de/html/admin/admin_edit_surfbar_urls.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_surfbar_urls_row.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_theme.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_theme_row.tpl svneol=native#text/plain
+templates/de/html/admin/admin_edit_theme_row_404.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_user.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_user_subids.tpl svneol=native#text/plain
 templates/de/html/admin/admin_edit_user_subids_row.tpl svneol=native#text/plain
@@ -1844,6 +1898,9 @@ templates/de/html/guest/guest_receive_table.tpl svneol=native#text/plain
 templates/de/html/guest/guest_register.tpl svneol=native#text/plain
 templates/de/html/guest/guest_register_refid.tpl svneol=native#text/plain
 templates/de/html/guest/guest_register_refid_hide.tpl svneol=native#text/plain
+templates/de/html/guest/guest_registration_provider.tpl svneol=native#text/plain
+templates/de/html/guest/guest_registration_provider_row.tpl svneol=native#text/plain
+templates/de/html/guest/guest_registration_select.tpl svneol=native#text/plain
 templates/de/html/guest/guest_show_rallye.tpl svneol=native#text/plain
 templates/de/html/guest/guest_sponsor_act_row.tpl svneol=native#text/plain
 templates/de/html/guest/guest_sponsor_activate.tpl svneol=native#text/plain
@@ -1868,6 +1925,7 @@ 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/guest/guest_wernis_registration_form.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
@@ -2255,6 +2313,7 @@ templates/xml/admin/admin_list_forced_ads.xml svneol=native#text/plain
 templates/xml/admin/admin_list_forced_campaigns.xml svneol=native#text/plain
 templates/xml/admin/admin_list_forced_costs.xml svneol=native#text/plain
 templates/xml/admin/admin_list_grade_data.xml svneol=native#text/plain
+templates/xml/admin/admin_list_network_api.xml svneol=native#text/plain
 templates/xml/admin/admin_list_network_query_api_config.xml svneol=native#text/plain
 templates/xml/admin/admin_list_nickname_history.xml svneol=native#text/plain
 templates/xml/admin/admin_list_point_accounts.xml svneol=native#text/plain