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

..

convertors

Bug #57265 - Convertors cannot read configuration files

2010-02-04 00:40:19 +00:00

data

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

schemas

Merge branch 'develop-olympus' into develop

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

database_update.php

We have to use a 'snapshot' of the function there, because it might not be available yet. - Bug #57755

2010-02-22 19:33:27 +00:00

index.php

merge changes from 3.0.x branch

2009-12-16 15:48:23 +00:00

install_convert.php

Support for Microsoft's Native SQL Server Driver for PHP - Patch by Chris Pucci at Microsoft [Bug #57055]

2010-02-11 00:02:51 +00:00

install_install.php

Support for Microsoft's Native SQL Server Driver for PHP - Patch by Chris Pucci at Microsoft [Bug #57055]

2010-02-11 00:02:51 +00:00

install_main.php

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

install_update.php

Update: Store expected resulting file contents in cache and do not suggest further merges if the contents match, also fixes infinite merge loop [Bug #54075]

2010-02-23 23:35:48 +00:00

phpinfo.php

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00