Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: df38a76b9f4bf745f5bd769fc43125b3036c3a68 https://github.com/phpmyadmin/phpmyadmin/commit/df38a76b9f4bf745f5bd769fc431... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths: M ChangeLog M export.php M import.php M libraries/config.default.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php M libraries/display_export.lib.php M libraries/display_import.lib.php M libraries/export.lib.php
Log Message: ----------- rfe #1306 Add lock tables, disable keys options
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Commit: a093119b190382ec7ec0878b0bb3994a2889e18f https://github.com/phpmyadmin/phpmyadmin/commit/a093119b190382ec7ec0878b0bb3... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths: M ChangeLog M libraries/central_columns.lib.php M libraries/config/messages.inc.php M libraries/tbl_columns_definition_form.lib.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/eo.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/fy.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/km.po M po/kn.po M po/ko.po M po/ksh.po M po/ky.po M po/li.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/ne.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/vi.po M po/vls.po M po/zh_CN.po M po/zh_TW.po M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php
Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/005486f3deef...a093119b1903