[dasher: 122/217] Merge branch 'master' of https://github.com/ipomoena/dasher

[Patrick Welche <pwelche src gnome org>]

commit fc533b2eacbed90664094965f7b99ad29f1f9eac
Merge: 1546245 954ef77
Author: ipomoena <amajorek google com>
Date:   Fri Nov 13 16:31:25 2015 -0800

    Merge branch 'master' of https://github.com/ipomoena/dasher

 Src/Gtk2/Canvas.cpp                 |    8 --------
 Src/Gtk2/DasherControl.cpp          |    8 +-------
 Src/Gtk2/dasher_editor.cpp          |    5 -----
 Src/Gtk2/dasher_main.cpp            |    2 +-
 Src/Gtk2/module_settings_window.cpp |    4 ----
 configure.ac                        |    2 +-
 6 files changed, 3 insertions(+), 26 deletions(-)
---