merge with master, fixing conflicts in 3 wscript files

This commit is contained in:
Paul Davis 2013-10-09 14:00:42 -04:00
commit 2a6a16f980
64 changed files with 4195 additions and 3528 deletions

View file

@ -156,8 +156,7 @@ class UI : public AbstractUI<UIRequest>
stopping just after we return from it (at the top level)
*/
sigc::signal<void> starting;
sigc::signal<void> stopping;
virtual int starting() = 0;
sigc::signal<void> theme_changed;