Merge conflict resolved for Lori's tree merge to main

2010-08-22 12:42:54 +05:30
parent e1f319eef1 7be8236208
commit c9253c0a0e
144 changed files with 81403 additions and 55891 deletions
--- a/tbl_export.php
+++ b/tbl_export.php
@@ -10,6 +10,8 @@
 */
 require_once './libraries/common.inc.php';

+$GLOBALS['js_include'][] = 'export.js';
+
 /**
 * Gets tables informations and displays top links
 */