projects / platform / core / test / security-tests.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 443598f 4f20901)
Merging tizen into ckm. Stage 1. 18/38318/1
authorKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Thu, 16 Apr 2015 09:36:22 +0000 (11:36 +0200)
committerKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Thu, 16 Apr 2015 09:46:43 +0000 (11:46 +0200)
commitfa4f892c33fe7c611aae6c43cf6cfa0bca26ecf5
tree7f0f6cd16aadae6d2d62ddca80b2c2c05ac60caatree | snapshot
parent443598f47c8f8c717184dc07fdbe4356f0b761e1commit | diff
parent4f20901f76f8909da0d07f8b5f8f33e8651ea135commit | diff
Merging tizen into ckm. Stage 1.

Merged commit '4f20901f76f8909da0d07f8b5f8f33e8651ea135' into ckm

Conflicts:
tests/common/dbus_access.cpp
tests/common/dbus_access.h
tests/cynara-tests/common/cynara_test_env.cpp
tests/security-server-tests/security_server_clean_env.cpp

Change-Id: I246988d04c104e990af34f06b10c6b79e3e5793d
packaging/security-tests.spec diff1 | diff2 | blob | history
tests/ckm/ckm-common.cpp diff1 | | blob | history
tests/ckm/clean-env.cpp diff1 | | blob | history
tests/ckm/clean-env.h diff1 | | blob | history
tests/common/CMakeLists.txt diff1 | diff2 | blob | history
tests/common/tests_common.h diff1 | diff2 | blob | history
Domain: Security / Uncategorized;