Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c86dec037870e25e2788ba3f71c1ec00d9606b6c https://github.com/phpmyadmin/phpmyadmin/commit/c86dec037870e25e2788ba3f71c1... Author: Lakshit Arora <lakshitarora26@gmail.com> Date: 2014-01-02 (Thu, 02 Jan 2014) Changed paths: M js/tbl_structure.js M libraries/structure.lib.php Log Message: ----------- Fixed Bug #4184 Commit: 0ef64c9d17c9857f82965d592631d29b613ffb18 https://github.com/phpmyadmin/phpmyadmin/commit/0ef64c9d17c9857f82965d592631... Author: Michal Čihař <mcihar@suse.cz> Date: 2014-01-03 (Fri, 03 Jan 2014) Changed paths: M js/tbl_structure.js M libraries/structure.lib.php Log Message: ----------- Merge branch 'bug-#4184' of git://github.com/lakshit/phpmyadmin into integration Commit: effa897aa28888f0cdfaa586adb5bc9e848e91b0 https://github.com/phpmyadmin/phpmyadmin/commit/effa897aa28888f0cdfaa586adb5... Author: Michal Čihař <mcihar@suse.cz> Date: 2014-01-03 (Fri, 03 Jan 2014) Changed paths: M js/tbl_structure.js M libraries/structure.lib.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' Conflicts: libraries/structure.lib.php Commit: 35e93ef92aca0950b6dee687e484d0a659af174e https://github.com/phpmyadmin/phpmyadmin/commit/35e93ef92aca0950b6dee687e484... Author: Michal Čihař <mcihar@suse.cz> Date: 2014-01-03 (Fri, 03 Jan 2014) Changed paths: M po/de.po Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1ff31df92fbd...35e93ef92aca