[Phpmyadmin-git] [phpmyadmin/phpmyadmin] f9b2f0: bug #3488777 [navi] $cfg['ShowTooltipAliasTB'] and...

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: f9b2f08f214780686615c6c1e7372117ac3f1461
      https://github.com/phpmyadmin/phpmyadmin/commit/f9b2f08f214780686615c6c1e7372117ac3f1461
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-02-18 (Sat, 18 Feb 2012)

  Changed paths:
    M ChangeLog
  M libraries/common.lib.php

  Log Message:
  -----------
  bug #3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names in navigation


  Commit: ff11bfbe648dbffcdf7edcc0b93eb98a78579e7c
      https://github.com/phpmyadmin/phpmyadmin/commit/ff11bfbe648dbffcdf7edcc0b93eb98a78579e7c
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-02-18 (Sat, 18 Feb 2012)

  Changed paths:
    M ChangeLog
  M libraries/common.lib.php

  Log Message:
  -----------
  Merge branch 'QA_3_4' into QA_3_5

Conflicts:
	libraries/common.lib.php


  Commit: 6c9c571e1bc7864f5334ec621957da40a9cfc0cd
      https://github.com/phpmyadmin/phpmyadmin/commit/6c9c571e1bc7864f5334ec621957da40a9cfc0cd
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2012-02-18 (Sat, 18 Feb 2012)

  Changed paths:
    M ChangeLog
  M libraries/common.lib.php

  Log Message:
  -----------
  Merge branch 'QA_3_5'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b3a70fe...6c9c571