add support for merged importing

[oweals/uci.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index c268c5121a9e6e768e266ce5e881875f5330cdb1..cfeb965b38795b6fd7f3719bd53bedffbe6568a5 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
-parsetest
-*.o
+uci
+*.[oa]
+.*.swp
+.gdb*