aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorlonkaars <loek@pipeframe.xyz>2022-10-30 11:20:43 +0100
committerlonkaars <loek@pipeframe.xyz>2022-10-30 11:21:00 +0100
commite4f41ef8b56b76214d05bce34ffd5a8896da24c9 (patch)
treeefe55c9ef28e4c787e10a5b85319b242c7525e9a /.gitignore
parente473fe14614401342cdc3afe3f6deee4831e6e24 (diff)
parentaf008eb04e3a5705eec63839abc5791454e763ce (diff)
finish second merge
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 5b91ddc..6cbf173 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,15 +6,16 @@
# stm32-specific files
stm32f091/main.elf
stm32f091/main.bin
-stm32f091/wifi.h
# client-specific files
client/makefile
client/client
client/moc_*
+client/ui_*
**/.user
# others
+shared/wifi.h
shared/main
.qmake.stash
.vscode/.cortex-debug.registers.state.json