[aseprite] 09/51: Merge branch 'applyButton' of https://github.com/TheKK/aseprite into apply-button

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit e353cdae4c5a8d5ec8e199897eac2a9f994fe93a
Merge: f81cd5a 1cf8269
Author: David Capello <davidcapello at gmail.com>
Date:   Tue Jun 14 09:23:26 2016 -0300

    Merge branch 'applyButton' of https://github.com/TheKK/aseprite into apply-button

 data/widgets/options.xml         | 1 +
 src/app/commands/cmd_options.cpp | 3 +++
 2 files changed, 4 insertions(+)

diff --cc data/widgets/options.xml
index 7198fc9,4899532..f19eed3
--- a/data/widgets/options.xml
+++ b/data/widgets/options.xml
@@@ -183,6 -164,7 +183,7 @@@
        <boxfiller />
        <hbox homogeneous="true">
          <button text="&OK" closewindow="true" id="button_ok" magnet="true" width="60" />
 -        <button text="&Apply" id="button_apply" width="60" />
++        <button text="&Apply" id="button_apply" />
          <button text="&Cancel" closewindow="true" />
        </hbox>
      </hbox>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git