Merge branch 'master' into cairocanvas

This commit is contained in:
Paul Davis 2013-04-26 14:20:11 -04:00
commit 54bf06e63c
13 changed files with 224 additions and 20 deletions

View file

@ -233,7 +233,8 @@ pane_size_watcher (Paned* pane)
}
Editor::Editor ()
: _join_object_range_state (JOIN_OBJECT_RANGE_NONE)
: VisibilityTracker (*((Gtk::Window*) this))
, _join_object_range_state (JOIN_OBJECT_RANGE_NONE)
/* time display buttons */
, minsec_label (_("Mins:Secs"))