Merge branch '0.6.0.x' into 0.6.x

[novacoin.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index dafbc2b..fe93caa 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ qrc_*.cpp
 *.pro.user
 #mac specific
 .DS_Store
+build