[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0df919: Fix indentation

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 0df919c0f60b49dfc1f804566b49d493a9708ea5
      https://github.com/phpmyadmin/phpmyadmin/commit/0df919c0f60b49dfc1f804566b49d493a9708ea5
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-06-04 (Mon, 04 Jun 2012)

  Changed paths:
    M libraries/import/upload/apc.php
    M libraries/import/upload/noplugin.php
    M libraries/import/upload/session.php
    M libraries/import/upload/uploadprogress.php

  Log Message:
  -----------
  Fix indentation


  Commit: 052a29867154c8ebee6cfe034286b40f7115f2f8
      https://github.com/phpmyadmin/phpmyadmin/commit/052a29867154c8ebee6cfe034286b40f7115f2f8
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-06-04 (Mon, 04 Jun 2012)

  Changed paths:
    M libraries/import/upload/noplugin.php

  Log Message:
  -----------
  Wrap a long line


  Commit: 7745c5c4a0d2a240c33eca285021a9f620664394
      https://github.com/phpmyadmin/phpmyadmin/commit/7745c5c4a0d2a240c33eca285021a9f620664394
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-06-04 (Mon, 04 Jun 2012)

  Changed paths:
    M libraries/engines/innodb.lib.php
    M libraries/engines/memory.lib.php
    M libraries/engines/myisam.lib.php
    M libraries/engines/ndbcluster.lib.php
    M libraries/engines/pbxt.lib.php

  Log Message:
  -----------
  Fix some doc blocks


  Commit: 93adf9fe2bccdcb1fa47c8568c45c12a2592ce32
      https://github.com/phpmyadmin/phpmyadmin/commit/93adf9fe2bccdcb1fa47c8568c45c12a2592ce32
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-06-04 (Mon, 04 Jun 2012)

  Changed paths:
    M libraries/engines/innodb.lib.php
    M libraries/engines/memory.lib.php
    M libraries/engines/merge.lib.php
    M libraries/engines/myisam.lib.php
    M libraries/engines/ndbcluster.lib.php

  Log Message:
  -----------
  Fix some function and class doc blocks


  Commit: 2b305ea81b42e351912eacfbf399e2de530d3768
      https://github.com/phpmyadmin/phpmyadmin/commit/2b305ea81b42e351912eacfbf399e2de530d3768
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-06-04 (Mon, 04 Jun 2012)

  Changed paths:
    M libraries/engines/innodb.lib.php
    M libraries/engines/ndbcluster.lib.php

  Log Message:
  -----------
  Doc blocks


  Commit: 0375b3f848ba85de7737df8ac135555bb5b298dc
      https://github.com/phpmyadmin/phpmyadmin/commit/0375b3f848ba85de7737df8ac135555bb5b298dc
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-06-04 (Mon, 04 Jun 2012)

  Changed paths:
    M libraries/engines/bdb.lib.php
    M libraries/engines/berkeleydb.lib.php
    M libraries/engines/pbxt.lib.php

  Log Message:
  -----------
  Various fixes to doc comments


  Commit: edc0a2fdf668db37193fec35374d96fd2d16a94a
      https://github.com/phpmyadmin/phpmyadmin/commit/edc0a2fdf668db37193fec35374d96fd2d16a94a
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-06-05 (Tue, 05 Jun 2012)

  Changed paths:
    M libraries/Table.class.php
    M libraries/relation.lib.php
    M po/sl.po

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


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/f16dfc8...edc0a2f