merge with master

This commit is contained in:
Paul Davis 2013-06-13 23:00:24 -04:00
commit f00b3b7f11
73 changed files with 29196 additions and 23779 deletions

View file

@ -896,6 +896,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
Glib::RefPtr<Gtk::Action> xjadeo_zoom_100;
void set_xjadeo_proc ();
void toggle_xjadeo_proc (int state=-1);
void set_close_video_sensitive (bool onoff);
void set_xjadeo_sensitive (bool onoff);
void set_xjadeo_viewoption (int);
void toggle_xjadeo_viewoption (int what, int state=-1);