merge resolution with master

This commit is contained in:
Paul Davis 2013-05-02 20:21:54 -04:00
commit e2f0c5f91e
66 changed files with 255 additions and 4024 deletions

View file

@ -2377,7 +2377,6 @@ Editor::rename_region ()
d.add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
d.set_size_request (300, -1);
d.set_position (Gtk::WIN_POS_MOUSE);
entry.set_text (rs.front()->region()->name());
entry.select_region (0, -1);