Andreas Fischer a01e916737 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/9916] Changing header in non-distributed files
  [ticket/9916] Changing coding guidelines license
  [ticket/9916] Updating License in the header

Conflicts:
	tests/mock/cache.php

2012-01-02 17:36:21 +01:00

..

phpbb_database_test_case.php

Merge branch 'develop-olympus' into develop

2012-01-02 17:36:21 +01:00

phpbb_database_test_connection_manager.php

[ticket/9916] Updating License in the header

2012-01-02 16:18:32 +00:00

phpbb_functional_test_case.php

Merge remote-tracking branch 'github-igorw/feature/functional-tests' into develop

2011-12-14 14:35:20 +01:00

phpbb_test_case_helpers.php

Merge branch 'develop-olympus' into develop

2012-01-02 17:36:21 +01:00

phpbb_test_case.php

[ticket/9916] Updating License in the header

2012-01-02 16:18:32 +00:00