projects / platform / core / security / libcryptsvc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9b2c5c 5a2162a)
Sync with tizen_2.2 accepted/tizen/ivi/genivi accepted/tizen/ivi/stable accepted/tizen_generic tizen_3.0.m14.2_ivi tizen_ivi_genivi accepted/tizen/20130912.094053 accepted/tizen/20130912.095658 accepted/tizen/20130912.150155 accepted/tizen/20130912.191746 accepted/tizen/20130912.195843 accepted/tizen/ivi/genivi/20140131.041919 accepted/tizen_ivi_stable/20131116.111627 ivi_oct_m2 submit/tizen/20130829.121231 submit/tizen/20130912.075936 submit/tizen/20130912.090245 submit/tizen_ivi_genivi/20140131.040633 submit/tizen_ivi_stable/20131116.100914 tizen_3.0.m14.2_ivi_release
authorso.yu <so.yu@samsung.com>
Thu, 29 Aug 2013 10:33:16 +0000 (19:33 +0900)
committerso.yu <so.yu@samsung.com>
Thu, 29 Aug 2013 10:33:16 +0000 (19:33 +0900)
Conflicts:
CMakeLists.txt

1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
index e2a98f37f54ce471b9e350ddb144261d4998426b,42153eed181c40772400c1cf1aa13c89acc761c1..5b53be4431dcde616b158d2c2a61cb2e006918c8
mode 100644,100755..100644
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
Domain: Security / Utilities;