Merge branch 'tizen' of tizen-public:/sdk/tools/sdk-build into tizen
authorSungmin Kim <dev.sungmin.kim@samsung.com>
Tue, 14 Jan 2014 11:24:20 +0000 (20:24 +0900)
committerSungmin Kim <dev.sungmin.kim@samsung.com>
Tue, 14 Jan 2014 11:24:20 +0000 (20:24 +0900)
commitc2a83f777b0a84fec04de55189dcd7b83e1739dd
treeef9682fad938d207d8100fafe6fb5339e5e8edf1
parentb171cec09eccbc8a2b0dc2d0e08cfa3fc4213ffa
parent669c011d30c822f621fa5c91504b2ebc2685e7f9
Merge branch 'tizen' of tizen-public:/sdk/tools/sdk-build into tizen

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