From: Sungmin Kim <dev.sungmin.kim@samsung.com>
Date: Tue, 14 Jan 2014 11:24:20 +0000 (+0900)
Subject: Merge branch 'tizen' of tizen-public:/sdk/tools/sdk-build into tizen
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c2a83f777b0a84fec04de55189dcd7b83e1739dd;p=sdk%2Ftools%2Fsdk-build.git

Merge branch 'tizen' of tizen-public:/sdk/tools/sdk-build into tizen

Conflicts:
	test/build-server.basic1/testsuite
---

c2a83f777b0a84fec04de55189dcd7b83e1739dd
diff --cc test/build-server.basic1/testsuite
index 3fe9461,09498fe..b720c6a
--- a/test/build-server.basic1/testsuite
+++ b/test/build-server.basic1/testsuite
@@@ -36,4 -36,4 +36,5 @@@ build-cli-35.testcas
  build-cli-36.testcase
  build-cli-37.testcase
  build-cli-38.testcase
+ build-cli-39.testcase
 +build-cli-41.testcase