Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7b12b12aeec1872a90c1f8b938643605efd4d1d7 https://github.com/phpmyadmin/phpmyadmin/commit/7b12b12aeec1872a90c1f8b93864... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-09-04 (Tue, 04 Sep 2012)

Changed paths: M gis_data_editor.php

Log Message: ----------- Avoid PHP, HTML mix. Improve doc comments

Commit: 3577f7fb3b99f832bb83279a15fd3f4e1251b10c https://github.com/phpmyadmin/phpmyadmin/commit/3577f7fb3b99f832bb83279a15fd... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-09-04 (Tue, 04 Sep 2012)

Changed paths: M js/gis_data_editor.js

Log Message: ----------- Adjust spaces between labels

Commit: 24912053933d5406b12eb34b1c0ca1f4a28cdf34 https://github.com/phpmyadmin/phpmyadmin/commit/24912053933d5406b12eb34b1c0c... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-09-04 (Tue, 04 Sep 2012)

Changed paths: M libraries/Message.class.php M libraries/dbi/drizzle-wrappers.lib.php M libraries/dbi/drizzle.dbi.lib.php

Log Message: ----------- Fix doc blocks

Commit: ba2ebd43fd9d2d640497a25370242ba16ae257c9 https://github.com/phpmyadmin/phpmyadmin/commit/ba2ebd43fd9d2d640497a2537024... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-09-04 (Tue, 04 Sep 2012)

Changed paths: M import.php M index.php M js/server_status_monitor.js M libraries/Error.class.php M libraries/schema/Eps_Relation_Schema.class.php M libraries/schema/Svg_Relation_Schema.class.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be@latin.po M po/bg.po M po/bn.po M po/br.po M po/bs.po M po/ca.po M po/ckb.po M po/cs.po M po/cy.po M po/da.po M po/de.po M po/el.po M po/en_GB.po M po/es.po M po/et.po M po/eu.po M po/fa.po M po/fi.po M po/fr.po M po/gl.po M po/he.po M po/hi.po M po/hr.po M po/hu.po M po/hy.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/ko.po M po/lt.po M po/lv.po M po/mk.po M po/ml.po M po/mn.po M po/ms.po M po/nb.po M po/nl.po M po/pa.po M po/phpmyadmin.pot M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.po M po/si.po M po/sk.po M po/sl.po M po/sq.po M po/sr.po M po/sr@latin.po M po/sv.po M po/ta.po M po/te.po M po/th.po M po/tk.po M po/tr.po M po/tt.po M po/ug.po M po/uk.po M po/ur.po M po/uz.po M po/uz@latin.po M po/zh_CN.po M po/zh_TW.po M tbl_gis_visualization.php M test/Environment_test.php M test/classes/PMA_DBQbe_test.php M test/classes/PMA_DbSearch_test.php M test/classes/PMA_Error_Handler_test.php M test/classes/PMA_Footer_test.php M test/classes/PMA_Scripts_test.php M test/classes/PMA_StorageEngine_test.php M test/classes/PMA_Theme_Manager_test.php M test/classes/PMA_Theme_test.php M test/classes/PMA_Types_Drizzle_test.php M test/classes/PMA_Types_MySQL_test.php M test/classes/PMA_Types_test.php M test/classes/gis/PMA_GIS_Geometry_test.php M test/classes/gis/PMA_GIS_Geometrycollection_test.php M test/classes/gis/PMA_GIS_Linestring_test.php M test/classes/gis/PMA_GIS_Multilinestring_test.php M test/classes/gis/PMA_GIS_Multipoint_test.php M test/classes/gis/PMA_GIS_Multipolygon_test.php M test/classes/gis/PMA_GIS_Point_test.php M test/classes/gis/PMA_GIS_Polygon_test.php M test/engines/PMA_StorageEngine_bdb_test.php M test/engines/PMA_StorageEngine_binlog_test.php M test/engines/PMA_StorageEngine_innodb_test.php M test/engines/PMA_StorageEngine_memory_test.php M test/engines/PMA_StorageEngine_mrg_myisam_test.php M test/engines/PMA_StorageEngine_myisam_test.php M test/engines/PMA_StorageEngine_ndbcluster_test.php M test/engines/PMA_StorageEngine_pbxt_test.php M test/libraries/PMA_build_html_for_db_test.php M test/libraries/PMA_js_escape_test.php M test/libraries/PMA_mime_test.php M test/libraries/PMA_operations_test.php M test/libraries/PMA_sanitize_test.php M test/libraries/PMA_zip_test.php M test/libraries/php-gettext/PMA_FileReader_test.php M test/libraries/php-gettext/PMA_StreamReader_test.php M test/libraries/php-gettext/PMA_StringReader_test.php M test/libraries/php-gettext/PMA_gettext_test.php

Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/44d59e763696...ba2ebd43fd9d