[Commits] [wesnoth/wesnoth] f60ef9: In the dialog layout code, fixed the button paddin...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: f60ef98e275fd3d16733f7d5dfd7314920841fd5
      https://github.com/wesnoth/wesnoth/commit/f60ef98e275fd3d16733f7d5dfd7314920841fd5
  Author: unknown <lweche159 at gmail.com>
  Date:   2014-08-01 (Fri, 01 Aug 2014)

  Changed paths:
    M src/construct_dialog.cpp

  Log Message:
  -----------
  In the dialog layout code, fixed the button padding.

There was no check if the "text_and_image_height"
variable was equal to zero. If so, the buttons were
placed -6 units too high.


  Commit: 1f30e6d373d692a8dc823d6c115ab20f8919e783
      https://github.com/wesnoth/wesnoth/commit/1f30e6d373d692a8dc823d6c115ab20f8919e783
  Author: unknown <lweche159 at gmail.com>
  Date:   2014-08-02 (Sat, 02 Aug 2014)

  Changed paths:
    M changelog
    M data/core/about.cfg

  Log Message:
  -----------
  Modified the changelog and added myself to the credits.


  Commit: ffa887f61c75eea961143eb669e35c0656b999b4
      https://github.com/wesnoth/wesnoth/commit/ffa887f61c75eea961143eb669e35c0656b999b4
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M changelog
    M src/construct_dialog.cpp

  Log Message:
  -----------
  Merge remote-tracking branch 'LovCAPONE/TopButtonStatsCutOff'

Conflicts:
	changelog


  Commit: fd236932ebc78228afc3c85c6cbe8fc7d5da1b56
      https://github.com/wesnoth/wesnoth/commit/fd236932ebc78228afc3c85c6cbe8fc7d5da1b56
  Author: Chris Beck <render787 at gmail.com>
  Date:   2014-10-04 (Sat, 04 Oct 2014)

  Changed paths:
    M changelog
    M data/core/help.cfg

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


Compare: https://github.com/wesnoth/wesnoth/compare/5284bfb3c549...fd236932ebc7