Merge tag 'v1.1.0' into tizen 97/35497/1
authorRafal Krypa <r.krypa@samsung.com>
Mon, 16 Feb 2015 16:32:18 +0000 (17:32 +0100)
committerRafal Krypa <r.krypa@samsung.com>
Mon, 16 Feb 2015 16:35:31 +0000 (17:35 +0100)
commitdf8a1a949a54efdccf68655f071b72023bcf6a8a
tree71860cb3ab73bc8480084e15f493c70518c3998a
parent66a110344be79ff2968ff6817ec72f569d852c17
parentaedd1f0410dfba2c6b7569175f16bd1cd223522b
Merge tag 'v1.1.0' into tizen

Conflicts:
configure.ac
debian/libsmack1.symbols
libsmack/Makefile.am
libsmack/libsmack.c
libsmack/sys/smack.h

Change-Id: Ic77fc70eeac91d8113a646a517f56cb59ffb4235
debian/libsmack1.symbols
libsmack/libsmack.c
libsmack/libsmack.sym
libsmack/sys/smack.h