projects / platform / core / test / security-tests.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf407a9 3b2ce10)
Merge branch 'security-manager' into tizen 93/30693/3
authorRafal Krypa <r.krypa@samsung.com>
Mon, 24 Nov 2014 11:27:24 +0000 (12:27 +0100)
committerRafal Krypa <r.krypa@samsung.com>
Mon, 24 Nov 2014 11:27:24 +0000 (12:27 +0100)
Conflicts:
tests/security-manager-tests/common/sm_db.cpp
tests/security-manager-tests/common/sm_db.h
tests/security-manager-tests/security_manager_tests.cpp

Change-Id: I69e6e9321ab58702086ba402e23a6d9b06e7fdb9

1  2 
packaging/security-tests.spec patch | diff1 | diff2 | blob | history

diff --cc packaging/security-tests.spec
Simple merge
Domain: Security / Uncategorized;