merge htmlreport/.gitignore in .gitignore

This commit is contained in:
XhmikosR 2012-10-02 08:30:02 +03:00 committed by PKEuS
parent 857ea9fb0d
commit 01716264c2
2 changed files with 3 additions and 2 deletions

3
.gitignore vendored
View File

@ -44,6 +44,9 @@ gui/*.qm
doxyoutput/ doxyoutput/
# qmake generated # qmake generated
htmlreport/.tox/
htmlreport/MANIFEST
# Backup files and stuff from patches # Backup files and stuff from patches
*.orig *.orig
*.rej *.rej

View File

@ -1,2 +0,0 @@
.tox/
MANIFEST