projects / platform / upstream / smack.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fbc5ee2 e8fa17a)
Merge branch 'v1.0.x'
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Wed, 18 Dec 2013 19:40:47 +0000 (21:40 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Wed, 18 Dec 2013 19:40:47 +0000 (21:40 +0200)
1  2 
libsmack/libsmack.c patch | diff1 | diff2 | blob | history

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