diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-05 14:22:32 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-05 14:22:32 -0400 |
| commit | 616f2a0370a10dcc7372a95f6bca9f5a45698980 (patch) | |
| tree | b07badccad237cc66d0668482ad65cedefdee23f /gtk2_ardour/video_server_dialog.cc | |
| parent | 499b7fcfa9f3e8535a4500143a9d7af7b67c6984 (diff) | |
| parent | 38e4f7bd1ba2ec9ae37dbb384da449f894cd8564 (diff) | |
fix conflicts after merge with master
Diffstat (limited to 'gtk2_ardour/video_server_dialog.cc')
| -rw-r--r-- | gtk2_ardour/video_server_dialog.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc index d7a018a045..811c00f64f 100644 --- a/gtk2_ardour/video_server_dialog.cc +++ b/gtk2_ardour/video_server_dialog.cc @@ -37,6 +37,7 @@ using namespace Gtk; using namespace std; using namespace PBD; using namespace ARDOUR; +using namespace VideoUtils; VideoServerDialog::VideoServerDialog (Session* s) : ArdourDialog (_("Launch Video Server")) |