Nils Adermann 3327739290 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.
  [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
  [ticket/11513] Use PHPUnit from composer in .travis.yml.
  [ticket/11513] Update (all) composer dependencies.
  [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.

Conflicts:
	.travis.yml
	phpBB/composer.lock

2013-05-09 19:42:13 +02:00

..

webpi

[ticket/9904] Update WebPI Parameters.xml to work with WebMatrix.

2010-11-19 11:27:16 +01:00

build_changelog.php

[ticket/9916] Changing header in non-distributed files

2012-01-02 16:20:30 +00:00

build_diff.php

Merge branch 'develop-olympus' into develop

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

build_helper.php

[ticket/9916] Changing header in non-distributed files

2012-01-02 16:20:30 +00:00

build.xml

Merge branch 'develop-olympus' into develop

2013-05-09 19:42:13 +02:00

compare.sh

Merge r10549 into 3.0.7: After generating all packages go through the full installs and make sure the files do not contain any errors [Bug #58255]

2010-02-27 22:08:43 +00:00

diff_class.php

[ticket/9916] Changing header in non-distributed files

2012-01-02 16:20:30 +00:00

package.php

[ticket/9916] Changing header in non-distributed files

2012-01-02 16:20:30 +00:00

phpdoc-phpbb.ini

[task/phpdoc] Make phpdoctor output quiet instead of verbose.

2011-01-07 14:15:45 +01:00