diff options
author | Rouslan Placella <rouslan@placella.com> | 2011-06-27 14:27:21 +0400 |
---|---|---|
committer | Rouslan Placella <rouslan@placella.com> | 2011-06-27 14:27:21 +0400 |
commit | ef3a45b5961659d843c978a9875c6a71bd9bb7c3 (patch) | |
tree | 78def364976522e14b3b188ba2d03198c5003c94 /db_events.php | |
parent | dc6be930befd001b2e12b9c18c923aec78b9a3a3 (diff) | |
parent | a01662dd4ac363c6bb1663ac6b81d7e797114503 (diff) |
Merge branch 'master' into rte
Conflicts:
libraries/db_events.inc.php
libraries/display_triggers.inc.php
Diffstat (limited to 'db_events.php')
-rw-r--r-- | db_events.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/db_events.php b/db_events.php index 9ff38480b3..ecab158c91 100644 --- a/db_events.php +++ b/db_events.php @@ -1,7 +1,9 @@ <?php /** + * Events management. * + * @package phpMyAdmin */ require_once './libraries/common.inc.php'; require_once './libraries/common.lib.php'; |