Merge remote-tracking branch 'remotes/origin/newminer'
[novacoin.git] / src / obj /
drwxr-xr-x   ..
-rw-r--r-- 14 .gitignore