projects / platform / upstream / smack.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8dad3d 33ed2e0)
Merge branch 'v1.0.x'
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Thu, 5 Jun 2014 16:24:46 +0000 (19:24 +0300)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Thu, 5 Jun 2014 16:24:46 +0000 (19:24 +0300)
1  2 
libsmack/libsmack.c patch | diff1 | diff2 | blob | history

diff --cc libsmack/libsmack.c
Simple merge
Domain: Security / Access Control;