From: Luc Yriarte <luc.yriarte@intel.com>
Date: Wed, 17 Jul 2013 20:03:24 +0000 (+0200)
Subject: Merge branch 'tizen' into mediaserver
X-Git-Tag: submit/tizen/20130807.192244~6^2~31
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8369f9c2fa31e5029d855dea602438eb2119b7e1;p=profile%2Fivi%2Fwrt-plugins-ivi.git

Merge branch 'tizen' into mediaserver
---

8369f9c2fa31e5029d855dea602438eb2119b7e1
diff --cc src/CMakeLists.txt
index ba21fae,b7f1ca4..ba21fae
mode 100755,100644..100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt