projects
/
speedfreak
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Conflict fixed: mainwindow.cpp and httpclient.cpp
[speedfreak]
/
Client
/
resultdialog.ui
diff --git
a/Client/resultdialog.ui
b/Client/resultdialog.ui
index
444fab4
..
8846941
100644
(file)
--- a/
Client/resultdialog.ui
+++ b/
Client/resultdialog.ui
@@
-179,9
+179,9
@@
<property name="geometry">
<rect>
<x>10</x>
- <y>310</y>
- <width>471</width>
- <height>51</height>
+ <y>350</y>
+ <width>781</width>
+ <height>21</height>
</rect>
</property>
<property name="text">