Merge branch 'v1.0.x'
authorJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Mon, 2 Dec 2013 06:39:34 +0000 (08:39 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Mon, 2 Dec 2013 06:39:34 +0000 (08:39 +0200)
1  2 
libsmack/libsmack.c

Simple merge