Merge branch 'master' into qt5

[toast/confclerk.git] / .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..af9b95b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+*.o
+*.a
+*.pro.user
+*.blend1
+ui_*.h
+moc_*.cpp
+qrc_*.cpp
+Makefile
+src/bin/confclerk