From 7380e973a5e8dd8633e955792f219f6231b9513e Mon Sep 17 00:00:00 2001
From: Shane Kearns <shane.kearns@accenture.com>
Date: Tue, 30 Nov 2010 14:24:59 +0000
Subject: Add test generated files to .gitignore

The tests/.gitignore, did not inherit from the main one, which causes
git to show hundreds of new files when running tests on symbian.

Reviewed-by: Markus Goetz
---
 .gitignore       | 14 +++++++++++++-
 tests/.gitignore |  6 ------
 2 files changed, 13 insertions(+), 7 deletions(-)
 delete mode 100644 tests/.gitignore

diff --git a/.gitignore b/.gitignore
index af52197..521cea2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -119,6 +119,14 @@ translations/*.qm
 translations/*_untranslated.ts
 qrc_*.cpp
 
+# Test generated files
+QObject.log
+tst_*
+!tst_*.*
+tst_*.log
+tst_*.debug
+tst_*~
+
 # xemacs temporary files
 *.flc
 
@@ -203,7 +211,7 @@ doc-build
 # ---------------------
 
 ABLD.BAT
-bld.inf
+bld.inf*
 *.mmp
 *.mk
 *.rss
@@ -221,6 +229,10 @@ plugin_commonu.def
 *.sym
 *.lib
 
+# runonphone crash dumps
+d_exc_*.txt
+d_exc_*.stk
+
 # Generated by abldfast.bat from devtools.
 .abldsteps.*
 
diff --git a/tests/.gitignore b/tests/.gitignore
deleted file mode 100644
index b203473..0000000
--- a/tests/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-QObject.log
-tst_*
-!tst_*.*
-tst_*.log
-tst_*.debug
-tst_*~
-- 
cgit v0.12