Merge remote-tracking branch 'rsa/tizen_2.1' into rsa_master
authorKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Wed, 29 May 2013 15:20:21 +0000 (17:20 +0200)
committerKrzysztof Jackiewicz <k.jackiewicz@samsung.com>
Wed, 29 May 2013 15:20:21 +0000 (17:20 +0200)
1  2 
CMakeLists.txt
packaging/libprivilege-control.spec

diff --cc CMakeLists.txt
Simple merge
Simple merge