From 352066c7d18e89cca02f520c56ce73216785b866 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Sun, 20 Apr 2014 09:45:18 +0200
Subject: [PATCH] Merge bug in AppPreferencesDialog: Cancel button broken!

---
 companion/src/apppreferencesdialog.ui | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/companion/src/apppreferencesdialog.ui b/companion/src/apppreferencesdialog.ui
index f3c967885..3e01c7c14 100644
--- a/companion/src/apppreferencesdialog.ui
+++ b/companion/src/apppreferencesdialog.ui
@@ -1146,5 +1146,21 @@ May be different from firmware language</string>
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>AppPreferencesDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>408</x>
+     <y>835</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>  
  </connections>
 </ui>