From 01716264c2535aa1a8e1134d37208a5ce96e3d8c Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Tue, 2 Oct 2012 08:30:02 +0300
Subject: [PATCH] merge htmlreport/.gitignore in .gitignore

---
 .gitignore            | 3 +++
 htmlreport/.gitignore | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
 delete mode 100644 htmlreport/.gitignore

diff --git a/.gitignore b/.gitignore
index c60a2cdf3..52d1df279 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,9 @@ gui/*.qm
 doxyoutput/
 # qmake generated
 
+htmlreport/.tox/
+htmlreport/MANIFEST
+
 # Backup files and stuff from patches
 *.orig
 *.rej
diff --git a/htmlreport/.gitignore b/htmlreport/.gitignore
deleted file mode 100644
index d825ccc88..000000000
--- a/htmlreport/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.tox/
-MANIFEST