[Phpmyadmin-git] [phpmyadmin/phpmyadmin] b2cbfb: Update setup design for pmahomme

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: b2cbfb355b48d4e3c1d94053700b2a7d25cff24b
      https://github.com/phpmyadmin/phpmyadmin/commit/b2cbfb355b48d4e3c1d94053700b2a7d25cff24b
  Author: J.M <me at mynetx.net>
  Date:   2012-05-07 (Mon, 07 May 2012)

  Changed paths:
    M setup/styles.css

  Log Message:
  -----------
  Update setup design for pmahomme


  Commit: 3a4b831cf507a9f8632ea474a9fa388d4e45cb4b
      https://github.com/phpmyadmin/phpmyadmin/commit/3a4b831cf507a9f8632ea474a9fa388d4e45cb4b
  Author: J.M <me at mynetx.net>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M setup/frames/index.inc.php
    M setup/index.php
    M setup/styles.css

  Log Message:
  -----------
  Adapt pmahomme style for setup pages


  Commit: daaf6dff2de94e3b9616f934899adced5ec67c25
      https://github.com/phpmyadmin/phpmyadmin/commit/daaf6dff2de94e3b9616f934899adced5ec67c25
  Author: Michal Čihař <mcihar at suse.cz>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M setup/frames/index.inc.php
    M setup/index.php
    M setup/styles.css

  Log Message:
  -----------
  Merge branch 'setup-css' of https://github.com/mynetx/phpmyadmin into merge

Conflicts:
	setup/index.php


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5c4dd56...daaf6df