projects / framework / security / smack.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1a5969 da01857)
Merge branch 'v1.0.x'
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Mon, 14 Apr 2014 21:22:21 +0000 (00:22 +0300)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Mon, 14 Apr 2014 21:22:21 +0000 (00:22 +0300)
1  2 
utils/chsmack.c patch | diff1 | diff2 | blob | history

diff --cc utils/chsmack.c
Simple merge
Domain: Security / Uncategorized;