From 3dcc5b36aebbffb0b6e9bc72f144d54ce28bb6fb Mon Sep 17 00:00:00 2001 From: "syeon.hwang" Date: Wed, 1 Aug 2012 16:00:38 +0900 Subject: [PATCH] [Title] Modify env variable name to find jni.h [Type] [Module] [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- tizen/src/skin/client/build.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tizen/src/skin/client/build.xml b/tizen/src/skin/client/build.xml index e6846ef..50c6b00 100644 --- a/tizen/src/skin/client/build.xml +++ b/tizen/src/skin/client/build.xml @@ -87,7 +87,8 @@ - + + @@ -105,7 +106,11 @@ +<<<<<<< HEAD + +======= +>>>>>>> c82a28fbb7e784e38e8536466461ef35ab766688 -- 2.7.4