From: syeon.hwang Date: Wed, 1 Aug 2012 07:00:38 +0000 (+0900) Subject: [Title] Modify env variable name to find jni.h X-Git-Tag: TizenStudio_2.0_p2.3~1396^2~33 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3dcc5b36aebbffb0b6e9bc72f144d54ce28bb6fb;p=sdk%2Femulator%2Fqemu.git [Title] Modify env variable name to find jni.h [Type] [Module] [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- 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