From a4d98a0650d44d7e1d36a077dcad441f282aad29 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Wed, 7 Oct 2015 13:45:55 +0200 Subject: ui: fix stderr nonsense Caused by mismerge --- facetracknoir/ui.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'facetracknoir/ui.cpp') diff --git a/facetracknoir/ui.cpp b/facetracknoir/ui.cpp index 4abafc80..50250d7c 100644 --- a/facetracknoir/ui.cpp +++ b/facetracknoir/ui.cpp @@ -35,7 +35,6 @@ MainWindow::MainWindow() : ui.video_frame_label->setPixmap(no_feed_pixmap); connect(ui.btnEditCurves, SIGNAL(clicked()), this, SLOT(showCurveConfiguration())); - connect(ui.btnShortcuts, SIGNAL(clicked()), this, SLOT(showKeyboardShortcuts())); connect(ui.btnShortcuts, SIGNAL(clicked()), this, SLOT(show_options_dialog())); connect(ui.btnShowServerControls, SIGNAL(clicked()), this, SLOT(showProtocolSettings())); -- cgit v1.2.3