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

..

firebird_schema.sql

Merge branch 'develop-olympus' into develop

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

index.htm

Copy 3.0.x branch to trunk

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

mssql_schema.sql

Merge branch 'develop-olympus' into develop

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

mysql_40_schema.sql

Merge branch 'develop-olympus' into develop

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

mysql_41_schema.sql

Merge branch 'develop-olympus' into develop

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

oracle_schema.sql

Merge branch 'develop-olympus' into develop

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

postgres_schema.sql

Merge branch 'develop-olympus' into develop

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

schema_data.sql

Change version number to 3.0.8-dev in preparation for development on next release

2010-02-01 01:18:21 +00:00

sqlite_schema.sql

Merge branch 'develop-olympus' into develop

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