Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f5329f23e041fb3beae431cc5f7228a69cab86ae https://github.com/phpmyadmin/phpmyadmin/commit/f5329f23e041fb3beae431cc5f72... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2012-06-23 (Sat, 23 Jun 2012) Changed paths: M libraries/insert_edit.lib.php Log Message: ----------- Coding style improvements (wrap some long lines, fix indentation, remove trailing spaces) Commit: 8284f22d546136f3427c214c8a666f0b48b3211f https://github.com/phpmyadmin/phpmyadmin/commit/8284f22d546136f3427c214c8a66... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2012-06-23 (Sat, 23 Jun 2012) Changed paths: M libraries/insert_edit.lib.php R libraries/tbl_replace_fields.inc.php M tbl_change.php M tbl_replace.php Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Conflicts: libraries/insert_edit.lib.php Commit: 7135fe75e073f984c78635a6fd16c787950be459 https://github.com/phpmyadmin/phpmyadmin/commit/7135fe75e073f984c78635a6fd16... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2012-06-23 (Sat, 23 Jun 2012) Changed paths: M libraries/insert_edit.lib.php Log Message: ----------- Fix coding style errors Commit: c150a4d31c9311b48c3e7512d1f6c686b8caad09 https://github.com/phpmyadmin/phpmyadmin/commit/c150a4d31c9311b48c3e7512d1f6... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2012-06-23 (Sat, 23 Jun 2012) Changed paths: M tbl_replace.php Log Message: ----------- Coding style fixes Compare: https://github.com/phpmyadmin/phpmyadmin/compare/795760221269...c150a4d31c93