Nils Adermann 6bfadd86ed Merge branch 'develop-ascraeus' into develop ...

* develop-ascraeus:
  [ticket/12789] Move duplicated functions to the base class
  [ticket/12789] Remove the directories in \phpbb\cache\driver\memory::purge()

Conflicts:
	phpBB/phpbb/cache/driver/file.php
	phpBB/phpbb/cache/driver/memory.php

2014-08-08 15:06:46 +02:00

..

apc.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

base.php

Merge branch 'develop-ascraeus' into develop

2014-08-08 15:06:46 +02:00

driver_interface.php

[ticket/12715] Cleanup comments in \phpbb\cache\driver\*

2014-06-15 16:39:31 +02:00

eaccelerator.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

file.php

Merge branch 'develop-ascraeus' into develop

2014-08-08 15:06:46 +02:00

memcache.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

memory.php

Merge branch 'develop-ascraeus' into develop

2014-08-08 15:06:46 +02:00

null.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

redis.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

wincache.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

xcache.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00