Commit Graph

11 Commits

Author SHA1 Message Date
lorilee
2ebf96d242 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
	libraries/display_export.lib.php
	libraries/display_import.lib.php
2010-07-20 13:04:03 -07:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
lorilee
3ba5c8e0f4 Fixed XHTML syntax problems 2010-06-18 16:11:52 -04:00
lorilee
43c6fbedea Updated hidden structure/data field name
Modified label text
2010-06-09 20:26:04 -04:00
Marc Delisle
b05a903dc3 gettext conversion 2010-05-14 07:47:50 -04:00
Michal Čihař
ebeb0c319f Adding @package, first part. 2008-11-24 10:32:56 +00:00
Michal Čihař
9561f56875 Fix some phpdoc errors. 2008-11-24 09:55:30 +00:00
Michal Čihař
5d010348da Add phpdoc package header to some files. 2008-11-24 09:14:31 +00:00
Marc Delisle
afbb2a9dc2 protection against XSS when register_globals is on and .htaccess has no effect 2008-06-21 15:01:27 +00:00
Marc Delisle
fee794f39b constants defined twice 2007-11-10 15:27:06 +00:00
Marc Delisle
1978e182d2 new export plugin for NHibernate 2007-11-06 17:51:37 +00:00