Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 2575cccf2dfbb0ca7b7953fe0c4a8e54d1f85b96
      
https://github.com/phpmyadmin/phpmyadmin/commit/2575cccf2dfbb0ca7b7953fe0c4a8e54d1f85b96
  Author: Madhura Jayaratne <[email protected]>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M libraries/dbi/mysqli.dbi.lib.php

  Log Message:
  -----------
  Coding style improvements (Last parameter comment requires a blank newline 
after it)


  Commit: 8efb8624080e9cbda7871498e8823e36444ea594
      
https://github.com/phpmyadmin/phpmyadmin/commit/8efb8624080e9cbda7871498e8823e36444ea594
  Author: Madhura Jayaratne <[email protected]>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M libraries/dbi/mysqli.dbi.lib.php

  Log Message:
  -----------
  More coding style fixes


  Commit: a817542fda9d84172ea378cc607156ca5d8c1b42
      
https://github.com/phpmyadmin/phpmyadmin/commit/a817542fda9d84172ea378cc607156ca5d8c1b42
  Author: Madhura Jayaratne <[email protected]>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M libraries/Table.class.php
    M libraries/common.lib.php
    M server_privileges.php

  Log Message:
  -----------
  Coding style improvements (Closing parenthesis of a multi-line function call 
must be on a line by itself)


  Commit: 50e6f3b387379becc11911ff755f3d54579c69f7
      
https://github.com/phpmyadmin/phpmyadmin/commit/50e6f3b387379becc11911ff755f3d54579c69f7
  Author: Madhura Jayaratne <[email protected]>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M export.php
    M libraries/Config.class.php
    M libraries/auth/swekey/swekey.php
    M libraries/common.lib.php
    M libraries/core.lib.php
    M libraries/export/htmlword.php
    M libraries/export/odt.php
    M libraries/export/texytext.php
    M libraries/mult_submits.inc.php
    M libraries/rte/rte_list.lib.php
    M user_password.php

  Log Message:
  -----------
  Coding style improvements (ControlSignature)


  Commit: d6e05d74b5c312c65e20f1a1ac3e5cc9320fd630
      
https://github.com/phpmyadmin/phpmyadmin/commit/d6e05d74b5c312c65e20f1a1ac3e5cc9320fd630
  Author: Madhura Jayaratne <[email protected]>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M libraries/Config.class.php
    M libraries/Table.class.php
    M libraries/display_tbl.lib.php
    M server_privileges.php

  Log Message:
  -----------
  Various coding style fixes


  Commit: 4ff76ff31c08d3a92cc6e08f84794fe9603141f4
      
https://github.com/phpmyadmin/phpmyadmin/commit/4ff76ff31c08d3a92cc6e08f84794fe9603141f4
  Author: Madhura Jayaratne <[email protected]>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M libraries/auth/swekey/swekey.php
    M libraries/import/sql.php
    M libraries/replication.inc.php
    M libraries/sysinfo.lib.php
    M pmd_relation_new.php
    M prefs_manage.php
    M server_databases.php
    M server_variables.php
    M setup/frames/index.inc.php
    M tbl_select.php
    M tbl_tracking.php

  Log Message:
  -----------
  Coding style improvements (Inline control structures are discouraged)


  Commit: 1064ea932d6c57da2093695e1120ce46f3bbdc98
      
https://github.com/phpmyadmin/phpmyadmin/commit/1064ea932d6c57da2093695e1120ce46f3bbdc98
  Author: Madhura Jayaratne <[email protected]>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M libraries/auth/swekey/swekey.auth.lib.php
    M libraries/auth/swekey/swekey.php

  Log Message:
  -----------
  Coding style fixes


  Commit: da0c3bbd1355f0e0b5716bbec5958a09835db517
      
https://github.com/phpmyadmin/phpmyadmin/commit/da0c3bbd1355f0e0b5716bbec5958a09835db517
  Author: Madhura Jayaratne <[email protected]>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M ChangeLog
    M js/tbl_structure.js
    M libraries/Table.class.php
    M libraries/tbl_properties.inc.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/[email protected]
    M po/bg.po
    M po/bn.po
    M po/br.po
    M po/bs.po
    M po/ca.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/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/ko.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/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/[email protected]
    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/[email protected]
    M po/zh_CN.po
    M po/zh_TW.po
    M tbl_alter.php
    M tbl_structure.php
    M test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
    M test/libraries/rte/PMA_RTN_getEditorForm_test.php
    M test/libraries/rte/PMA_RTN_getExecuteForm_test.php
    M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
    M themes/original/css/theme_right.css.php
    M themes/pmahomme/css/theme_right.css.php

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

Conflicts:
        libraries/Table.class.php


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ad57f68...da0c3bb
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to