Merge remote-tracking branch 'origin/master' into fresh_chibios_2nd

This commit is contained in:
rusefi 2017-04-05 22:40:27 -04:00
commit 2b72c128b3
1 changed files with 20 additions and 0 deletions

View File

@ -24,4 +24,24 @@
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
</natures>
<filteredResources>
<filter>
<id>1491445130159</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-stm32f1egt</arguments>
</matcher>
</filter>
<filter>
<id>1491445130166</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-stm32f0egt</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>