Merge branch 'master' of github.com:microbuilder/tinyusb

Conflicts:
	demos/host/host_freertos/host_freertos.uvopt
This commit is contained in:
hathach 2014-03-14 16:53:50 +07:00
commit b545544c32
1 changed files with 1 additions and 1 deletions

View File

@ -220,7 +220,7 @@
</option>
<option>
<name>CCDiagError</name>
<state></state>
<state>Pa050</state>
</option>
<option>
<name>CCObjPrefix</name>