Thomas Müller c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches ... Conflicts: lib/private/migration/content.php		2014-02-18 18:31:33 +01:00
..
adapter.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
adapteroci8.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
adapterpgsql.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
adaptersqlite.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
adaptersqlsrv.php	Inherit lastInsertId() from Adapter.	2013-11-04 22:28:41 +01:00
connection.php	polish documentation based on scrutinizer patches	2014-02-06 17:02:21 +01:00
connectionwrapper.php	polish documentation based on scrutinizer patches	2014-02-06 17:02:21 +01:00
mdb2schemamanager.php	polish documentation based on scrutinizer patches	2014-02-06 17:02:21 +01:00
mdb2schemareader.php	Style fixes	2014-02-12 09:09:51 +01:00
mdb2schemawriter.php	polish documentation based on scrutinizer patches	2014-02-06 17:02:21 +01:00
oracleconnection.php	move the private namespace OC into lib/private - OCP will stay in lib/public	2013-09-30 16:36:59 +02:00
statementwrapper.php	Merge branch 'master' into scrutinizer_documentation_patches	2014-02-18 18:31:33 +01:00