Merge branch '3.0'

This commit is contained in:
Ingo Schommer 2012-08-09 11:51:26 +02:00
commit 4eef8e32bd

View File

@ -1,6 +1,6 @@
<?php
require_once 'PHPUnit/Framework/TestResult.php';
require_once 'PHPUnit/Framework/TestListener.php';
if(!class_exists('PHPUnit_Framework_TestResult', false)) require_once 'PHPUnit/Framework/TestResult.php';
if(!class_exists('PHPUnit_Framework_TestListener', false)) require_once 'PHPUnit/Framework/TestListener.php';
/**#@+
* @var int