phpbb/phpBB/includes/extension
Igor Wiedler 83bdf3eeb3 Merge branch 'develop' into ticket/11015
* develop:
  [ticket/11012] Fix php_ext change in mock_extension_manager
  [ticket/11012] Normalize $phpEx member vars to $php_ext
  [ticket/11002] Use translating option to rename the Etc/GMT options

Conflicts:
	phpBB/includes/extension/manager.php
2012-07-21 18:21:08 +02:00
..
base.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
controller.php [ticket/11012] Normalize $phpEx member vars to $php_ext 2012-07-21 16:19:01 +02:00
controller_interface.php [ticket/10586] Remove handle() from abstract class, undo change in index.php 2012-03-28 16:37:42 -04:00
finder.php [ticket/11012] Normalize $phpEx member vars to $php_ext 2012-07-21 16:19:01 +02:00
interface.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
manager.php Merge branch 'develop' into ticket/11015 2012-07-21 18:21:08 +02:00
provider.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00