Merge branch 'master' into pocsag

This commit is contained in:
Jonathan Naylor 2018-06-25 17:47:24 +01:00
commit 88c530d9e6
4 changed files with 8 additions and 2 deletions

2
.gitignore vendored
View File

@ -1,7 +1,5 @@
*.o
obj/
bin/
STM32F4XX_Lib/
STM32F7XX_Lib/
GitVersion.h
build/

6
.gitmodules vendored Normal file
View File

@ -0,0 +1,6 @@
[submodule "STM32F4XX_Lib"]
path = STM32F4XX_Lib
url = https://github.com/juribeparada/STM32F4XX_Lib.git
[submodule "STM32F7XX_Lib"]
path = STM32F7XX_Lib
url = https://github.com/juribeparada/STM32F7XX_Lib.git

1
STM32F4XX_Lib Submodule

@ -0,0 +1 @@
Subproject commit bcd346f53036ed0eab6643d662a410861655afe2

1
STM32F7XX_Lib Submodule

@ -0,0 +1 @@
Subproject commit 2d5f4236fa5e9828beadbc72473293f25b3ad65e