AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commits are now allowed when a merge integration has occured even when no files are modified

Browse Source 
Support for forced merges
Context menus are offset by a pixel to prevent unintended clicks


FossilOrigin-Name: b0f81bc9c4d226d8406f65d9ad02099205d7e067
This commit is contained in:
kostas
2015-05-03 12:27:11 +00:00
parent cdba8c05f6
commit 894f980a7c
10 changed files with 84 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ui/UpdateDialog.ui
View File

@ -10,7 +10,7 @@
<x>0</x>
<y>0</y>
<width>478</width>
<height>146</height>
<height>177</height>
</rect>
</property>
<property name="minimumSize">
@ -56,6 +56,13 @@
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lblForce">
<property name="text">
<string>Force</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="chkIntegrate">
<property name="text">
@ -63,6 +70,13 @@
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="chkForce">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>