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

Conflicts: demos/host/host_os_none/host_os_none.uvopt
2013-09-12 14:44:02 +07:00
parent ad5ce98c02 50d0e9bb8d
commit 968c218f33
4 changed files with 42 additions and 2 deletions
@@ -746,7 +746,7 @@
            <CpuDllArguments></CpuDllArguments>
            <PeripheralDll></PeripheralDll>
            <PeripheralDllArguments></PeripheralDllArguments>
-            <InitializationFile></InitializationFile>
+            <InitializationFile>..\..\bsp\boards\microbuilder\board_lpc4357usb_etminit.ini</InitializationFile>
            <Driver>Segger\JL2CM3.dll</Driver>
          </TargetDlls>
        </DebugOption>