diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2013-04-02 18:41:01 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-04-02 18:41:01 +0200 |
| commit | 8303597a865400a363ae574ccde819302495f498 (patch) | |
| tree | c83b383b3ec818f610cc6137f2b72ee7b4173b09 /ftnoir_tracker_sm/ftnoir_sm_controls.ui | |
| parent | 8adf6b1650af6027f28db12ca2b4de92a3fac11d (diff) | |
Just put everything new in. Conflict resolution will be later
Diffstat (limited to 'ftnoir_tracker_sm/ftnoir_sm_controls.ui')
| -rw-r--r-- | ftnoir_tracker_sm/ftnoir_sm_controls.ui | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ftnoir_tracker_sm/ftnoir_sm_controls.ui b/ftnoir_tracker_sm/ftnoir_sm_controls.ui index 93befd19..06ebc9ca 100644 --- a/ftnoir_tracker_sm/ftnoir_sm_controls.ui +++ b/ftnoir_tracker_sm/ftnoir_sm_controls.ui @@ -15,7 +15,7 @@ </property>
<property name="windowIcon">
<iconset>
- <normaloff>images/FaceTrackNoIR.ico</normaloff>images/FaceTrackNoIR.ico</iconset>
+ <normaloff>images/sm.png</normaloff>images/sm.png</iconset>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
@@ -103,7 +103,7 @@ <property name="title">
<string>Enable Axis</string>
</property>
- <widget class="QWidget" name="">
+ <widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>10</x>
|