Merge remote-tracking branch 'rsa/master' into tizen
authorKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Tue, 21 Jan 2014 13:26:37 +0000 (14:26 +0100)
committerKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Thu, 30 Jan 2014 11:44:15 +0000 (12:44 +0100)
commit90154afbb9eb9c4b85ba5c0a6676c66463425d1f
tree3dfe0e2f23f46a906d64ae5edf81f33592bbca91
parentb0babe27722e8020213865fb8a0b84b0593b47e1
parent85dfa2bece91f12a804561afe4469f42ade3d76e
Merge remote-tracking branch 'rsa/master' into tizen

Conflicts:
CMakeLists.txt
include/privilege-control.h
packaging/libprivilege-control-conf.manifest
packaging/libprivilege-control.changes
packaging/libprivilege-control.manifest
packaging/libprivilege-control.spec
packaging/smack-default-labeling.service
smack_default_labeling
src/privilege-control.c

Change-Id: I8d0a785c405f9b0df698143e5fa4792c2ac3caef
CMakeLists.txt
packaging/libprivilege-control.changes
packaging/libprivilege-control.spec
smack-rules.service
smack_default_labeling
smack_rules
src/access-db.c
src/privilege-control.c