berti_r/Motion_test
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing issues caused by auto merge

Browse Source
This commit is contained in:
Luke Nisbet
2020-04-07 13:59:19 +01:00
parent 91145db1b6
commit bd9629cbbd
3 changed files with 1016 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1000
solution/solution.tsproj
View File

File diff suppressed because it is too large Load Diff

15
solution/tc_project_app/GlobalTextList.TcGTLO
View File

@@ -185,6 +185,11 @@
<v n="TextDefault">"Errors:"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"768"</v>
<v n="TextDefault">"eWriteParameter"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"955"</v>
<v n="TextDefault">"fAcceleration"</v>
@@ -205,6 +210,11 @@
<v n="TextDefault">"fRatio"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"781"</v>
<v n="TextDefault">"fReadAxisParameter"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"708"</v>
<v n="TextDefault">"Free Entries:"</v>
@@ -215,6 +225,11 @@
<v n="TextDefault">"fVelocity"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"688"</v>
<v n="TextDefault">"fWriteAxisParameter"</v>
<l n="LanguageTexts" t="ArrayList" />
</o>
<o>
<v n="TextID">"299"</v>
<v n="TextDefault">"gearIn"</v>

2
solution/tc_project_app/tc_mca_std_lib

Submodule solution/tc_project_app/tc_mca_std_lib updated: 5d08b5e64f...49d2b891de