Merge branch 'master' of https://github.com/jenoki/LrLite.git

Conflicts: .gitignore
remov-b4-flight · Mar 22, 2019 · 8896d0b · 8896d0b
2 parents 4b3dc42 + 1715909
commit 8896d0b
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 1,607 deletions.
diff --git a/.cproject.bak b/.cproject.bak
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@
 *.o
 *.ko
 *.obj
+*.elf
 
 # Linker output
 *.ilk
@@ -33,6 +34,7 @@
 *.app
 *.i*86
 *.x86_64
+*.hex
 
 # Debug files
 *.dSYM/
@@ -48,10 +50,14 @@ modules.order
 Module.symvers
 Mkfile.old
 dkms.conf
-/Debug/
-
 #Others
+/Debug/
+/Release/Drivers/
+/Release/Middleweres
+/Release/Src/
+/Release/startup/
+/Src/Backup/
+/Inc/Backup/
 *.bak
 *.kicad_pcb-bak
-*.mk
-*.list
+/.settings/
diff --git a/.osx.project.bak b/.osx.project.bak
diff --git a/.project.bak b/.project.bak
diff --git a/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc/usbd_hid.h.bak b/Middlewares/ST/STM32_USB_Device_Library/Class/HID/Inc/usbd_hid.h.bak