Branch: refs/heads/QA_4_1 Home: https://github.com/phpmyadmin/phpmyadmin Commit: ab693b3c5dc521843f279ad3d9dc9dade7691364 https://github.com/phpmyadmin/phpmyadmin/commit/ab693b3c5dc521843f279ad3d9dc... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-01-03 (Fri, 03 Jan 2014)

Changed paths: M ChangeLog M libraries/db_info.inc.php M libraries/navigation/NavigationTree.class.php

Log Message: ----------- bug #4212 Table "disappears" if it has the same name as its tablegroup

Commit: cc38e422dc02f51c99786ac2c4092025431d1b46 https://github.com/phpmyadmin/phpmyadmin/commit/cc38e422dc02f51c99786ac2c409... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-01-03 (Fri, 03 Jan 2014)

Changed paths: M ChangeLog M README M doc/conf.py M export.php M js/ajax.js M js/makegrid.js M js/navigation.js M js/pmd/iecanvas.js M js/sql.js M js/tbl_structure.js M libraries/Config.class.php M libraries/DisplayResults.class.php M libraries/core.lib.php M libraries/display_import.lib.php M libraries/navigation/NavigationHeader.class.php M libraries/server_privileges.lib.php M libraries/sql.lib.php M libraries/structure.lib.php M pmd_general.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/ia.po M po/id.po M po/it.po M po/ja.po M po/ka.po M po/kk.po M po/kn.po M po/ko.po M po/ky.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/vls.po M po/zh_CN.po M po/zh_TW.po M test/libraries/PMA_server_privileges_test.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/062437dfbe2f...cc38e422dc02