Marc Delisle 82acbb2ba3 fix merge conflicts		2010-08-21 07:46:57 -04:00
..
codegen.php	Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin	2010-07-20 13:04:03 -07:00
csv.php	Fix typo.	2010-08-19 11:47:39 +02:00
excel.php	Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin	2010-07-20 13:04:03 -07:00
htmlword.php	Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin	2010-07-20 13:04:03 -07:00
json.php	Fixes for JSON plugin.	2010-08-19 14:05:04 +02:00
latex.php	Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc	2010-07-23 21:06:46 -07:00
mediawiki.php	Fixed XHTML syntax problems	2010-06-18 16:11:52 -04:00
ods.php	Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin	2010-07-20 13:04:03 -07:00
odt.php	Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin	2010-07-20 13:04:03 -07:00
pdf.php	Merge remote branch 'lori/gsoc'	2010-08-19 11:11:51 +02:00
php_array.php	Fixed XHTML syntax problems	2010-06-18 16:11:52 -04:00
sql.php	account for changes introduced when merging lori/gsoc branch	2010-08-19 16:36:41 +02:00
texytext.php	Fixed XHTML syntax problems	2010-06-18 16:11:52 -04:00
xls.php	Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin	2010-07-20 13:04:03 -07:00
xlsx.php	Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin	2010-07-20 13:04:03 -07:00
xml.php	Should be closing a group, not a subgroup	2010-08-02 13:14:41 -07:00
yaml.php	Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin	2010-07-20 13:04:03 -07:00