Merge branch 'master' into tizen_2.1
authorJaeho Lee <jaeho81.lee@samsung.com>
Fri, 22 Mar 2013 08:48:23 +0000 (17:48 +0900)
committerJaeho Lee <jaeho81.lee@samsung.com>
Fri, 22 Mar 2013 08:48:23 +0000 (17:48 +0900)
commitd3cc0a1ec097ff99074866e6f47c30858054d234
tree1cab4f8a00a1a3f4ef1ec8051cb6f40aa82edbfc
parente9e3374e1f8b0ed5038d77a47bcbf198176ba788
parent16d81c8f7951b216b45dd94a142687c561da654c
Merge branch 'master' into tizen_2.1

remove sysman dependency

Conflicts:
CMakeLists.txt
packaging/app-core.spec
src/appcore-efl.c

Signed-off-by: Jaeho Lee <jaeho81.lee@samsung.com>