From: Cole Robinson <crobinso@redhat.com>
Date: Fri, 27 Feb 2015 15:21:21 +0000 (-0500)
Subject: gitignore: Track common.env in iotests gitignore
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~419^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1dfb1adc44af1e3ceb09850c0d7cc4779721bc73;p=sdk%2Femulator%2Fqemu.git

gitignore: Track common.env in iotests gitignore

Rather than track it in the toplevel gitignore

Signed-off-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

Conflicts:
	.gitignore

Change-Id: I87b0c256cf728b27b9459e1a59e8cf844736ce06
---

diff --git a/.gitignore b/.gitignore
index de308188a7..436802733c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -111,7 +111,6 @@ cscope.*
 tags
 TAGS
 *~
-/tests/qemu-iotests/common.env
 tizen/emulator
 tizen/src/build_info.h
 tizen/src/skin/client/src/about.properties
diff --git a/tests/qemu-iotests/.gitignore b/tests/qemu-iotests/.gitignore
index 0541f80daa..0711cbdbf3 100644
--- a/tests/qemu-iotests/.gitignore
+++ b/tests/qemu-iotests/.gitignore
@@ -1,5 +1,6 @@
 check.log
 check.time
+common.env
 *.out.bad
 *.notrun
 socket_scm_helper