sem/microcontrollers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pull

Browse Source
This commit is contained in:
Sem van der Hoeven
2021-03-31 10:23:34 +02:00
parent e424c26d42 fcffefbb7e
commit 83863ec5f5
123 changed files with 9369 additions and 9465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Microcontrollers/Microcontrollers.atsln
View File

@@ -119,10 +119,13 @@ Global
{FE1D92D4-4858-4112-AD41-E57799A980C9}.Debug|AVR.Build.0 = Debug|AVR
{FE1D92D4-4858-4112-AD41-E57799A980C9}.Release|AVR.ActiveCfg = Release|AVR
{FE1D92D4-4858-4112-AD41-E57799A980C9}.Release|AVR.Build.0 = Release|AVR
<<<<<<< HEAD
{EAFA506A-B042-4CB2-9335-FBC1D7364EFB}.Debug|AVR.ActiveCfg = Debug|AVR
{EAFA506A-B042-4CB2-9335-FBC1D7364EFB}.Debug|AVR.Build.0 = Debug|AVR
{EAFA506A-B042-4CB2-9335-FBC1D7364EFB}.Release|AVR.ActiveCfg = Release|AVR
{EAFA506A-B042-4CB2-9335-FBC1D7364EFB}.Release|AVR.Build.0 = Release|AVR
=======
>>>>>>> fcffefbb7e2c6dd1fafecca07bf84ecaf04b4fd4
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE