Branch: refs/heads/QA_4_1
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: db6ec589073f6f52524ca89b290177b6080e4e9c
https://github.com/phpmyadmin/phpmyadmin/commit/db6ec589073f6f52524ca89b290177b6080e4e9c
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-04-21 (Mon, 21 Apr 2014)
Changed paths:
M ChangeLog
M libraries/structure.lib.php
M libraries/tbl_columns_definition_form.inc.php
M libraries/tbl_columns_definition_form.lib.php
Log Message:
-----------
bug #4372 Changing browser transformation results in unnecessary table rebuild
Signed-off-by: Marc Delisle <m...@infomarc.info>
Commit: 8ef6a0fac0f37a89c7589cf1cda1f1426945c163
https://github.com/phpmyadmin/phpmyadmin/commit/8ef6a0fac0f37a89c7589cf1cda1f1426945c163
Author: Marc Delisle <m...@infomarc.info>
Date: 2014-04-21 (Mon, 21 Apr 2014)
Changed paths:
M ChangeLog
M libraries/navigation/NavigationTree.class.php
M po/ia.po
M po/ko.po
M po/ta.po
M themes/pmahomme/css/common.css.php
Log Message:
-----------
Fix merge conflict
Signed-off-by: Marc Delisle <m...@infomarc.info>
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/54febec2e51a...8ef6a0fac0f3------------------------------------------------------------------------------
Start Your Social Network Today - Download eXo Platform
Build your Enterprise Intranet with eXo Platform Software
Java Based Open Source Intranet - Social, Extensible, Cloud Ready
Get Started Now And Turn Your Intranet Into A Collaboration Platform
http://p.sf.net/sfu/ExoPlatform
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
