Merged keepassx-http.

2014-03-22 12:48:43 +00:00
parent 54bb7462f6 41be9e8178
commit 73f91db939
114 changed files with 21277 additions and 199 deletions
--- a/src/gui/EditWidgetIcons.ui
+++ b/src/gui/EditWidgetIcons.ui
@@ -91,6 +91,13 @@
       </property>
      </widget>
     </item>
+     <item>
+      <widget class="QPushButton" name="faviconButton">
+       <property name="text">
+        <string>Download favicon</string>
+       </property>
+      </widget>
+     </item>
    </layout>
   </item>
  </layout>