Nils Adermann 693a2dc99b Merge branch 'develop-olympus' into develop ...

I simply used the develop-olympus version of all files that conflicted.
Afterall there should not have been anything new in develop yet.

2010-03-03 23:32:09 +01:00

..

add_permissions.php

…

adjust_avatars.php

…

adjust_bbcodes.php

…

adjust_magic_urls.php

…

adjust_sizes.php

…

adjust_smilies.php

…

adjust_uids.php

…

adjust_usernames.php

…

benchmark.php

…

calc_email_hash.php

…

change_smiley_ref.php

…

collect_cache_stats.sh

…

create_schema_files.php

Merge branch 'develop-olympus' into develop

2010-03-03 23:32:09 +01:00

create_variable_overview.php

…

fill.php

…

fix_files.sh

fix_files script must have been broken by svn:eol-style quite a while ago, now uses tr rather than sed to replace carriage returns

2010-01-31 21:50:10 +00:00

generate_utf_casefold.php

…

generate_utf_confusables.php

Just a little reminder for when we decide to update the confusables one day

2009-12-23 01:31:19 +00:00

generate_utf_tables.php

…

lang_duplicates.php

…

merge_attachment_tables.php

…

merge_post_tables.php

…

mysql_upgrader.php

Merge branch 'develop-olympus' into develop

2010-03-03 23:32:09 +01:00

nuke-db.php

…

regex.php

…

repair_bots.php

…

search_fill.php

…

unicode_testing.php

…

update_email_hash.php

…

utf_normalizer_test.php

…