Merge branch 'master' of github.com:microbuilder/tinyusb
Conflicts: demos/host/host_freertos/host_freertos.uvopt
This commit is contained in:
commit
b545544c32
|
@ -220,7 +220,7 @@
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>CCDiagError</name>
|
<name>CCDiagError</name>
|
||||||
<state></state>
|
<state>Pa050</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>CCObjPrefix</name>
|
<name>CCObjPrefix</name>
|
||||||
|
|
Loading…
Reference in New Issue