projects / platform / core / test / security-tests.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b2deac 4bee76d)
Merge branch 'cynara' into tizen 92/30692/1
authorRafal Krypa <r.krypa@samsung.com>
Mon, 24 Nov 2014 10:19:41 +0000 (11:19 +0100)
committerRafal Krypa <r.krypa@samsung.com>
Mon, 24 Nov 2014 10:19:41 +0000 (11:19 +0100)
Conflicts:
tests/cynara-tests/common/cynara_test_admin.h
tests/cynara-tests/test_cases.cpp

Change-Id: I49296db7a8983f3aee1f4750852ea516e9d7f3a2

1  2 
packaging/security-tests.spec patch | diff1 | diff2 | blob | history
tests/framework/include/dpl/test/test_runner.h patch | diff1 | diff2 | blob | history

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