phpbb/phpBB/includes/db
Andreas Fischer 37b28ca7e7 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [develop-olympus] Increment version number to 3.0.13-dev.
  [develop-olympus] Add changelog for 3.0.12 release.
  [develop-olympus] Bump version numbers for 3.0.12-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.12 releases.

Conflicts:
	build/build.xml
	phpBB/docs/INSTALL.html
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/imageset/imageset.cfg
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/prosilver/template/template.cfg
	phpBB/styles/prosilver/theme/theme.cfg
	phpBB/styles/subsilver2/imageset/imageset.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/template.cfg
	phpBB/styles/subsilver2/theme/theme.cfg
2013-07-12 21:34:15 +02:00
..
driver [ticket/11503] similar implementation for mssql_native and odbc 2013-06-20 19:16:21 +05:30
migration Merge branch 'develop-olympus' into develop 2013-07-12 21:34:15 +02:00
db_tools.php Merge remote-tracking branch 'exreaction/ticket/11350' into develop 2013-02-07 00:56:31 +01:00
index.htm Moved to includes ... since they are included too .. trying to "clean up" structure a little 2003-03-17 10:54:23 +00:00
migrator.php Merge remote-tracking branch 'remotes/Blitze/ticket/11383' into develop 2013-03-09 18:33:19 -06:00
sql_insert_buffer.php [ticket/11469] Add comment about using bitwise operator. 2013-03-28 00:28:51 +01:00