Merge branch 'master' of https://github.com/worklist/hifi into 19507

This commit is contained in:
Stojce Slavkovski 2014-05-12 19:42:44 +02:00
commit ff9daa257c

View file

@ -88,10 +88,6 @@ padding-top: 3px;</string>
<property name="text">
<string>Reload all</string>
</property>
<property name="icon">
<iconset>
<normaloff>../resources/images/reload.svg</normaloff>../resources/images/reload.svg</iconset>
</property>
</widget>
<widget class="QPushButton" name="stopAllButton">
<property name="geometry">
@ -115,10 +111,6 @@ padding-top: 3px;</string>
<property name="text">
<string>Stop all</string>
</property>
<property name="icon">
<iconset>
<normaloff>../resources/images/stop.svg</normaloff>../resources/images/stop.svg</iconset>
</property>
</widget>
<widget class="QLabel" name="recentlyLoadedLabel">
<property name="geometry">
@ -251,10 +243,6 @@ padding-top: 3px;</string>
<property name="text">
<string>Load script</string>
</property>
<property name="icon">
<iconset>
<normaloff>../resources/images/plus.svg</normaloff>../resources/images/plus.svg</iconset>
</property>
</widget>
<zorder>widgetTitle</zorder>
<zorder>currentlyRunningLabel</zorder>