summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorStefan Zabka <zabkaste@hu-berlin.de>2020-06-10 17:11:44 +0200
committerStefan Zabka <zabkaste@hu-berlin.de>2020-06-10 17:11:44 +0200
commit5598f8300b9d3e7b49a4d3e65d1d837616b8beb5 (patch)
tree84fe96600f41f7d9a7b806edf8f27a3fbb82da4e /.gitignore
parent47aaae2c42d554963fb811b68fdf28c9743598e8 (diff)
parentd80bb89ceaee252cff304c3f7dcb160d3bee8fde (diff)
downloadbetriebssysteme-5598f8300b9d3e7b49a4d3e65d1d837616b8beb5.tar.gz
betriebssysteme-5598f8300b9d3e7b49a4d3e65d1d837616b8beb5.zip
Merge branch 'master' into threadpool
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 49fc4a3..a02e442 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
*.d
cmake-build-debug/
bootloader.bin
-build \ No newline at end of file
+build
+*.zip