# 
# 
# patch "guitone/res/forms/about.ui"
#  from [a62ebd990b1f8f514d9050f87bc138ac922da549]
#    to [c82a2bb9bc1c26e4f470d8ec637114bdc551d666]
# 
# patch "guitone/res/forms/databaseview.ui"
#  from [5c602f2ec0c304cd3c454d21fb0385fbf293113f]
#    to [d46272be614eb7366175802476e860a80c1e0a70]
# 
# patch "guitone/res/forms/file_diff.ui"
#  from [617e65923c434029b2a4b9de4871bd84b1be47c3]
#    to [7892257391ce4faa476cd26cb04e424ac91a4e2d]
# 
# patch "guitone/res/forms/generate_keypair.ui"
#  from [a6f3ef8c02360b57fdde7f9373c9c2eb5a65c50e]
#    to [7a7913333631ef38db4a1807f1559e89b353d91d]
# 
# patch "guitone/res/forms/key_management.ui"
#  from [43db4269c32215f364566ab241981264ce2c29aa]
#    to [edec01c656964ce19977a8305c380207fa222bff]
# 
# patch "guitone/res/forms/main_window.ui"
#  from [cb79edbe42210e45b59391f214bba7058e40526f]
#    to [654b91584067e615bb181161a408fe795025758b]
# 
# patch "guitone/res/forms/preferences.ui"
#  from [2db8a53259024f638fe93f7b9a7124c9cfc89e41]
#    to [9e93e317aee87b3c5cb3d798e7a1ded37a8b0ff9]
# 
# patch "guitone/res/forms/revision_diff.ui"
#  from [a3134f5041e9898cee601414966037537bc98c13]
#    to [ad0e31fbd4c9f994cdec9a694aad0c2de499ef59]
# 
# patch "guitone/res/forms/switch_workspace.ui"
#  from [6c0c81f6c627c645c6b15e069296b16e7aa70ba0]
#    to [5b6fe51ea63043d36ca1ef52190d834f3ad0c33a]
# 
# patch "guitone/src/main.cpp"
#  from [a3ce8b80e208cae046b9de97edc2e5ae7f66cde4]
#    to [65dc8121bc3e89b4fd1b370a51554f9c81ec9306]
# 
============================================================
--- guitone/res/forms/about.ui	a62ebd990b1f8f514d9050f87bc138ac922da549
+++ guitone/res/forms/about.ui	c82a2bb9bc1c26e4f470d8ec637114bdc551d666
@@ -25,7 +25,7 @@
    <string>About guitone</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="../guitone.qrc" >:/guitone-icon.svg</iconset>
+   <iconset resource="../guitone.qrc" >:/icons/guitone.png</iconset>
   </property>
   <layout class="QVBoxLayout" >
    <property name="margin" >
============================================================
--- guitone/res/forms/databaseview.ui	5c602f2ec0c304cd3c454d21fb0385fbf293113f
+++ guitone/res/forms/databaseview.ui	d46272be614eb7366175802476e860a80c1e0a70
@@ -13,7 +13,7 @@
    <string>Database</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="../guitone.qrc" >:/guitone-icon.svg</iconset>
+   <iconset resource="../guitone.qrc" >:/icons/guitone.png</iconset>
   </property>
   <layout class="QVBoxLayout" >
    <property name="margin" >
============================================================
--- guitone/res/forms/file_diff.ui	617e65923c434029b2a4b9de4871bd84b1be47c3
+++ guitone/res/forms/file_diff.ui	7892257391ce4faa476cd26cb04e424ac91a4e2d
@@ -13,7 +13,7 @@
    <string>File differences of "%1"</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="../guitone.qrc" >:/guitone-icon.svg</iconset>
+   <iconset resource="../guitone.qrc" >:/icons/guitone.png</iconset>
   </property>
   <layout class="QVBoxLayout" >
    <property name="margin" >
============================================================
--- guitone/res/forms/generate_keypair.ui	a6f3ef8c02360b57fdde7f9373c9c2eb5a65c50e
+++ guitone/res/forms/generate_keypair.ui	7a7913333631ef38db4a1807f1559e89b353d91d
@@ -33,7 +33,7 @@
    <string>Generate new Keypair</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="../guitone.qrc" >:/guitone-icon.svg</iconset>
+   <iconset resource="../guitone.qrc" >:/icons/guitone.png</iconset>
   </property>
   <property name="sizeGripEnabled" >
    <bool>false</bool>
============================================================
--- guitone/res/forms/key_management.ui	43db4269c32215f364566ab241981264ce2c29aa
+++ guitone/res/forms/key_management.ui	edec01c656964ce19977a8305c380207fa222bff
@@ -13,7 +13,7 @@
    <string>Key Management</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="../guitone.qrc" >:/guitone-icon.svg</iconset>
+   <iconset resource="../guitone.qrc" >:/icons/guitone.png</iconset>
   </property>
   <layout class="QVBoxLayout" >
    <property name="margin" >
============================================================
--- guitone/res/forms/main_window.ui	cb79edbe42210e45b59391f214bba7058e40526f
+++ guitone/res/forms/main_window.ui	654b91584067e615bb181161a408fe795025758b
@@ -12,6 +12,9 @@
   <property name="windowTitle" >
    <string>guitone - a frontend for monotone</string>
   </property>
+  <property name="windowIcon" >
+   <iconset resource="../guitone.qrc" >:/icons/guitone.png</iconset>
+  </property>
   <widget class="QWidget" name="centralwidget" >
    <layout class="QVBoxLayout" >
     <property name="margin" >
============================================================
--- guitone/res/forms/preferences.ui	2db8a53259024f638fe93f7b9a7124c9cfc89e41
+++ guitone/res/forms/preferences.ui	9e93e317aee87b3c5cb3d798e7a1ded37a8b0ff9
@@ -24,7 +24,7 @@
    <string>Preferences</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="../guitone.qrc" >:/guitone-icon.svg</iconset>
+   <iconset resource="../guitone.qrc" >:/icons/guitone.png</iconset>
   </property>
   <property name="sizeGripEnabled" >
    <bool>false</bool>
============================================================
--- guitone/res/forms/revision_diff.ui	a3134f5041e9898cee601414966037537bc98c13
+++ guitone/res/forms/revision_diff.ui	ad0e31fbd4c9f994cdec9a694aad0c2de499ef59
@@ -5,7 +5,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>444</width>
+    <width>484</width>
     <height>432</height>
    </rect>
   </property>
@@ -13,7 +13,7 @@
    <string>Differences in %1 between %2 and %3</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="../guitone.qrc" >:/guitone-icon.svg</iconset>
+   <iconset resource="../guitone.qrc" >:/icons/guitone.png</iconset>
   </property>
   <layout class="QVBoxLayout" >
    <property name="margin" >
============================================================
--- guitone/res/forms/switch_workspace.ui	6c0c81f6c627c645c6b15e069296b16e7aa70ba0
+++ guitone/res/forms/switch_workspace.ui	5b6fe51ea63043d36ca1ef52190d834f3ad0c33a
@@ -13,7 +13,7 @@
    <string>Switch Workspace Revision</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="../guitone.qrc" >:/guitone-icon.svg</iconset>
+   <iconset resource="../guitone.qrc" >:/icons/guitone.png</iconset>
   </property>
   <layout class="QVBoxLayout" >
    <property name="margin" >
@@ -138,19 +138,15 @@
  </widget>
  <customwidgets>
   <customwidget>
+   <class>Splitter</class>
+   <extends>QSplitter</extends>
+   <header>../Splitter.h</header>
+  </customwidget>
+  <customwidget>
    <class>TreeView</class>
    <extends>QTreeView</extends>
    <header>TreeView.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
   </customwidget>
-  <customwidget>
-   <class>Splitter</class>
-   <extends>QSplitter</extends>
-   <header>Splitter.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>selectorBox</tabstop>
============================================================
--- guitone/src/main.cpp	a3ce8b80e208cae046b9de97edc2e5ae7f66cde4
+++ guitone/src/main.cpp	65dc8121bc3e89b4fd1b370a51554f9c81ec9306
@@ -52,8 +52,7 @@ int main(int argc, char** argv)
     }
     
     mainWnd->show();
-    
-	app.setWindowIcon(QIcon(":icons/guitone.png"));
+
     app.connect(&app, SIGNAL(lastWindowClosed()), mainWnd, SLOT(quit()));
 
     return app.exec();