projects
/
platform
/
core
/
test
/
security-tests.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
90f48e8
49db936
)
Merge remote-tracking branch 'tizen/tizen' into HEAD
21/65121/1
author
Rafal Krypa
<r.krypa@samsung.com>
Thu, 7 Apr 2016 09:25:55 +0000
(11:25 +0200)
committer
Rafal Krypa
<r.krypa@samsung.com>
Thu, 7 Apr 2016 09:26:01 +0000
(11:26 +0200)
Change-Id: Ie1d708ebbfe9444bcbc17b017bdc8e9b7e2dfcfe
1
2
src/security-manager-tests/security_manager_tests.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/security-manager-tests/security_manager_tests.cpp
Simple merge