diff options
| author | hathach <[email protected]> | 2014-03-14 16:53:50 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2014-03-14 16:53:50 +0700 |
| commit | b545544c32e4e8212583425b531f711cca6684ff (patch) | |
| tree | f2ac4b34fdec8e487933f8d23b90ea079a7847e4 | |
| parent | 21a50c6f730191a43f544ea64c729f85cf14f65a (diff) | |
| parent | 2cac860e1a5ec0687908ec1d83544d433e6d1684 (diff) | |
Merge branch 'master' of github.com:microbuilder/tinyusb
Conflicts:
demos/host/host_freertos/host_freertos.uvopt
| -rw-r--r-- | demos/host/host_freertos/host_freertos.ewp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/host/host_freertos/host_freertos.ewp b/demos/host/host_freertos/host_freertos.ewp index f451f16fe..a2c0fc674 100644 --- a/demos/host/host_freertos/host_freertos.ewp +++ b/demos/host/host_freertos/host_freertos.ewp @@ -220,7 +220,7 @@ </option>
<option>
<name>CCDiagError</name>
- <state></state>
+ <state>Pa050</state>
</option>
<option>
<name>CCObjPrefix</name>
|