summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorNiklas Halle <niklas@niklashalle.net>2020-05-24 13:05:34 +0200
committerNiklas Halle <niklas@niklashalle.net>2020-05-24 13:05:34 +0200
commit8f33ab3bf8b7d5a256c1d996e572fa67a5578b4f (patch)
tree44c55b4679f8546f940df7191f191ed290c57f6f /.gitignore
parentbed31a7634701b2c19ef8eef3ccb3039c03b1cda (diff)
parent7a9c301d10e001b92846b6b1e64136c10c4bb247 (diff)
downloadbetriebssysteme-8f33ab3bf8b7d5a256c1d996e572fa67a5578b4f.tar.gz
betriebssysteme-8f33ab3bf8b7d5a256c1d996e572fa67a5578b4f.zip
Merge remote-tracking branch 'origin/MOAR_CMAKE' into dev/niklas
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 02c228d..49fc4a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,5 @@
*_exe
*.d
cmake-build-debug/
-bootloader.bin \ No newline at end of file
+bootloader.bin
+build \ No newline at end of file