[vidalia-svn] r2650: The .qrc file was renamed in a previous commit. (in vidalia: . trunk/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-06-03 08:51:58 -0400 (Tue, 03 Jun 2008)
New Revision: 2650

Modified:
   vidalia/
   vidalia/trunk/src/vidalia/mainwindow.ui
Log:
 r437@thebe:  edmanm | 2008-06-03 08:52:37 -0400
 The .qrc file was renamed in a previous commit.



Property changes on: vidalia
___________________________________________________________________
 svk:merge ticket from /local/vidalia [r437] on 45a62a8a-8088-484c-baad-c7b3e776dd32

Modified: vidalia/trunk/src/vidalia/mainwindow.ui
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.ui	2008-06-03 03:45:17 UTC (rev 2649)
+++ vidalia/trunk/src/vidalia/mainwindow.ui	2008-06-03 12:51:58 UTC (rev 2650)
@@ -33,7 +33,7 @@
    <string>Vidalia Control Panel</string>
   </property>
   <property name="windowIcon" >
-   <iconset resource="res/vidalia_common.qrc" >:/images/32x32/tor-logo.png</iconset>
+   <iconset resource="res/vidalia.qrc" >:/images/32x32/tor-logo.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget" >
    <layout class="QVBoxLayout" >
@@ -505,7 +505,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="res/vidalia_common.qrc" />
+  <include location="res/vidalia.qrc" />
  </resources>
  <connections>
   <connection>