projects / platform / core / test / security-tests.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitdd67f52075a7f6e999f879706ed1a7b83bf5d600
tree6f35d69f40c7a2a05a87da3ec4a3412f2d2dde8btree | snapshot
parentbf407a931960de718014d10e1d5329e0917a8ff5commit | diff
parent3b2ce10e7ec8b10e3c1d96ae52302ef46c29829dcommit | diff
Merge branch 'security-manager' into tizen

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
packaging/security-tests.spec diff1 | diff2 | blob | history
Domain: Security / Uncategorized;