Revision 10558
commit 693a2dc99bf07aeac1865d4a48ddf2589317ac7a
Merge: b68de23 ac32927
Author: Nils Adermann <naderman@naderman.de>
AuthorDate: Wed Mar 3 23:32:09 2010 +0100
Commit: Nils Adermann <naderman@naderman.de>
CommitDate: Wed Mar 3 23:32:09 2010 +0100
Merge branch 'develop-olympus' into developI simply used the develop-olympus version of all files that conflicted.
Afterall there should not have been anything new in develop yet.Files
- added
- modified
- copied
- renamed
- deleted
- trunk
- build
- git-revision
- phpBB
- .htaccess (diff)
- adm
- develop
- create_schema_files.php (diff)
- fix_files.sh (diff)
- generate_utf_confusables.php (diff)
- mysql_upgrader.php (diff)
- docs
- feed.php (diff)
- includes
- acm
- acp
- acp_attachments.php (diff)
- acp_bbcodes.php (diff)
- acp_board.php (diff)
- acp_captcha.php (diff)
- acp_database.php (diff)
- acp_icons.php (diff)
- acp_language.php (diff)
- acp_main.php (diff)
- acp_styles.php (diff)
- auth
- bbcode.php (diff)
- cache.php (diff)
- captcha
- constants.php (diff)
- db
- db_tools.php (diff)
- dbal.php (diff)
- firebird.php (diff)
- mssqlnative.php
- mysql.php (diff)
- oracle.php (diff)
- functions.php (diff)
- functions_admin.php (diff)
- functions_compress.php (diff)
- functions_content.php (diff)
- functions_convert.php (diff)
- functions_display.php (diff)
- functions_install.php (diff)
- functions_messenger.php (diff)
- functions_posting.php (diff)
- mcp
- message_parser.php (diff)
- questionnaire
- search
- session.php (diff)
- template.php (diff)
- ucp
- install
- convertors
- database_update.php (diff)
- install_convert.php (diff)
- install_install.php (diff)
- install_update.php (diff)
- schemas
- language
- memberlist.php (diff)
- posting.php (diff)
- search.php (diff)
- styles
- prosilver
- imageset
- style.cfg (diff)
- template
- editor.js (diff)
- forum_fn.js (diff)
- mcp_post.html (diff)
- overall_header.html (diff)
- template.cfg (diff)
- ucp_avatar_options.html (diff)
- ucp_pm_viewmessage_print.html (diff)
- viewforum_body.html (diff)
- viewtopic_print.html (diff)
- theme
- subsilver2
- viewtopic.php (diff)