Auto stash before merge of "master" and "origin/master"

This commit is contained in:
Unknown 2017-10-11 19:59:45 +08:00
parent 44438a3bc4
commit f694d0577b

View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
<FileVersion major="1" minor="0" />
<ActiveTarget name="Debug" />
<File name="..\..\HMI\src\HMI_Engine.c" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="20704" topLine="490" />
</Cursor>
</File>
<File name="..\..\Resource\Resource.rc" open="1" top="1" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="371" topLine="0" />
</Cursor>
</File>
</CodeBlocks_layout_file>