Commit 46ab8d3f authored by Nathan Girard's avatar Nathan Girard
Browse files

màj pour merge

parent 9b3a965d
......@@ -111,7 +111,7 @@
<RegID>0</RegID>
<MDITabState>
<Len>600</Len>
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000400000000000000010000004A443A5C446F63756D656E74735C53545C506F6C79737461725C4749545C636F6E74726F6C652D65742D73797374656D655C5374616E646172645F726F626F745C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF52443A5C446F63756D656E74735C53545C506F6C79737461725C4749545C636F6E74726F6C652D65742D73797374656D655C5374616E646172645F726F626F745C4253505C4465766963655C6D6F746F722E6300000000076D6F746F722E6300000000FFDC7800FFFFFFFF53443A5C446F63756D656E74735C53545C506F6C79737461725C4749545C636F6E74726F6C652D65742D73797374656D655C5374616E646172645F726F626F745C4253505C416C676F726974686D5C7069642E6300000000057069642E6300000000BECEA100FFFFFFFF57443A5C446F63756D656E74735C53545C506F6C79737461725C4749545C636F6E74726F6C652D65742D73797374656D655C5374616E646172645F726F626F745C4253505C4465766963655C6C6973745F6D6F746F722E63000000000C6C6973745F6D6F746F722E6300000000F0A0A100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000E700000066000000000600005A020000</Data>
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000400000001000000010000004A443A5C446F63756D656E74735C53545C506F6C79737461725C4749545C636F6E74726F6C652D65742D73797374656D655C5374616E646172645F726F626F745C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF52443A5C446F63756D656E74735C53545C506F6C79737461725C4749545C636F6E74726F6C652D65742D73797374656D655C5374616E646172645F726F626F745C4253505C4465766963655C6D6F746F722E6300000000076D6F746F722E6300000000FFDC7800FFFFFFFF53443A5C446F63756D656E74735C53545C506F6C79737461725C4749545C636F6E74726F6C652D65742D73797374656D655C5374616E646172645F726F626F745C4253505C416C676F726974686D5C7069642E6300000000057069642E6300000000BECEA100FFFFFFFF57443A5C446F63756D656E74735C53545C506F6C79737461725C4749545C636F6E74726F6C652D65742D73797374656D655C5374616E646172645F726F626F745C4253505C4465766963655C6C6973745F6D6F746F722E63000000000C6C6973745F6D6F746F722E6300000000F0A0A100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000E700000066000000000600005A020000</Data>
</MDITabState>
</MDIClientArea>
<ViewEx>
......@@ -3603,21 +3603,21 @@
<ActiveMDIGroup>0</ActiveMDIGroup>
<MDIGroup>
<Size>100</Size>
<ActiveTab>0</ActiveTab>
<ActiveTab>1</ActiveTab>
<Doc>
<Name>../Src/main.c</Name>
<ColumnNumber>45</ColumnNumber>
<TopLine>199</TopLine>
<CurrentLine>213</CurrentLine>
<ColumnNumber>4</ColumnNumber>
<TopLine>136</TopLine>
<CurrentLine>221</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>..\BSP\Device\motor.c</Name>
<ColumnNumber>13</ColumnNumber>
<TopLine>94</TopLine>
<CurrentLine>109</CurrentLine>
<ColumnNumber>15</ColumnNumber>
<TopLine>1</TopLine>
<CurrentLine>77</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment