t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'WIP2' into WIP

Browse Source 
Conflicts:
	SavvyCAN.pro
	config.h
	mainwindow.cpp
	mainwindow.h
	mainwindow.ui

Resolved conflicts between branches
This commit is contained in:
Collin Kidder
2015-12-20 21:29:23 -05:00
parent c699e54548 09ff3f850a
commit 45cd9d6171
27 changed files with 1818 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mainwindow.ui
+16 -14
View File
@@ -204,13 +204,12 @@
<property name="title">
<string>RE Tools</string>
</property>
<addaction name="actionSingle_Multi_State"/>
<addaction name="actionRange_State"/>
<addaction name="actionFlow_View"/>
<addaction name="actionFuzzy_Scope"/>
<addaction name="actionGraph_Dta"/>
<addaction name="actionFrame_Data_Analysis"/>
<addaction name="actionFile_Comparison"/>
<addaction name="actionRange_State_2"/>
<addaction name="actionSingle_Multi_State_2"/>
</widget>
<widget class="QMenu" name="menuSend_Frames">
<property name="title">
@@ -218,7 +217,7 @@
</property>
<addaction name="action_Playback"/>
<addaction name="action_Custom"/>
<addaction name="actionFirmware_Uploader"/>
<addaction name="actionScripting_INterface"/>
</widget>
<widget class="QMenu" name="menuFile">
<property name="title">
@@ -263,16 +262,6 @@
<string>Custom</string>
</property>
</action>
<action name="actionSingle_Multi_State">
<property name="text">
<string>Single / Multi State</string>
</property>
</action>
<action name="actionRange_State">
<property name="text">
<string>Range State</string>
</property>
</action>
<action name="actionFlow_View">
<property name="text">
<string>Flow View</string>
@@ -366,6 +355,19 @@
<action name="actionConnect">
<property name="text">
<string>Connect</string>
<action name="actionScripting_INterface">
<property name="text">
<string>Scripting Interface</string>
</property>
</action>
<action name="actionRange_State_2">
<property name="text">
<string>Range State</string>
</property>
</action>
<action name="actionSingle_Multi_State_2">
<property name="text">
<string>Single/Multi State</string>
</property>
</action>
</widget>