projects / platform / core / test / security-tests.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f8102e f3d77c9)
Merge branch 'tizen' into cynara 31/60631/1
authorZbigniew Jasinski <z.jasinski@samsung.com>
Mon, 29 Feb 2016 11:16:50 +0000 (12:16 +0100)
committerZbigniew Jasinski <z.jasinski@samsung.com>
Mon, 29 Feb 2016 11:16:50 +0000 (12:16 +0100)
Conflicts:
src/security-server-tests/security_server_tests_password.cpp

Change-Id: I753ad499c1bf64330fc0af352e7468c13539c752


Trivial merge
Domain: Security / Uncategorized;