projects / platform / upstream / smack.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ac53341 4f8cc4b)
Merge remote-tracking branch 'jsakkine/issue60' into v1.0.x
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Mon, 2 Dec 2013 17:34:51 +0000 (19:34 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Mon, 2 Dec 2013 17:34:51 +0000 (19:34 +0200)
1  2 
libsmack/libsmack.c patch | diff1 | diff2 | blob | history

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