Marc Delisle ab7942be89 Fix merge conflicts ...

Signed-off-by: Marc Delisle <marc@infomarc.info>

2015-11-29 07:29:32 -05:00

..

_data

Fix typos.

2014-11-02 18:32:42 +01:00

config

Remove tab characters

2015-10-16 18:24:51 +11:00

controllers

Update tests

2015-11-27 20:25:32 +11:00

dbi

Rename test classes

2015-10-15 20:57:27 +11:00

engines

Remove tab characters

2015-10-16 18:24:51 +11:00

gis

Rename test classes

2015-10-15 20:57:27 +11:00

navigation

Merge branch 'QA_4_5'

2015-10-26 19:23:37 +11:00

plugin

Remove side effects in declaration files.

2015-11-15 17:31:53 +01:00

properties

Rename test classes

2015-10-15 20:57:27 +11:00

schema

Rename test classes

2015-10-15 20:57:27 +11:00

AdvisorTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

ConfigGeneratorTest.php

More tests for classes

2015-10-16 18:09:41 +11:00

ConfigTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

DatabaseInterfaceTest.php

Fix missing namespace.

2015-11-08 17:02:08 +01:00

DbQbeTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

DbSearchTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

DisplayResultsTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

ErrorHandlerTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

ErrorTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

FileTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

FontTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

FooterTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

HeaderTest.php

Remove side effects in declaration files.

2015-11-15 17:31:53 +01:00

IndexTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

LinterTest.php

Rename more class related tests

2015-10-16 19:42:09 +11:00

ListDatabaseTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

MenuTest.php

Remove side effects in declaration files.

2015-11-15 17:31:53 +01:00

MessageTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

PDFTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

PMA_StringTest.php

Rename more class related tests

2015-10-16 19:42:09 +11:00

ScriptsTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

ServerStatusDataTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

StorageEngineTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

StringCTypeTest.php

Rename more class related tests

2015-10-16 19:42:09 +11:00

StringNativeType.php

Rename more class related tests

2015-10-16 19:42:09 +11:00

SystemDatabaseTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

TableTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

TemplateTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

ThemeManagerTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

ThemeTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

TrackerTest.php

Rename more class related tests

2015-10-16 19:42:09 +11:00

TypesMySQLTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

TypesTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

UtilTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

VersionInformationTest.php

Rename test classes

2015-10-15 20:57:27 +11:00

ZipFileTest.php

Rename more class related tests

2015-10-16 19:42:09 +11:00