Merge remote-tracking branch 'remotes/rsa/tizen_2.2' into tizen
authorSoo-Hyun Choi <s.choi@hackerslab.eu>
Sun, 20 Oct 2013 07:42:56 +0000 (16:42 +0900)
committerSoo-Hyun Choi <s.choi@hackerslab.eu>
Sun, 20 Oct 2013 07:42:56 +0000 (16:42 +0900)
commite9cb9962c0508802db6318a1a2cdd14474ee712f
tree925d1acc25591a389708af94d8c721ca1b731cae
parent745a7480abb8471d3644d617509e3962f0424b64
parent69a4e5e245a464071fe0b6fd2dda62254f249d72
Merge remote-tracking branch 'remotes/rsa/tizen_2.2' into tizen

Conflicts:
packaging/wrt-plugins-tizen.spec
pkgconfigs/wrt-plugins-tizen-application.pc.in
pkgconfigs/wrt-plugins-tizen-contact.pc.in
pkgconfigs/wrt-plugins-tizen-filesystem.pc.in
src/Systeminfo/CMakeLists.txt

Change-Id: Ie43336986fbe271293ae327031601d7cfde47e35
CMakeLists.txt
packaging/wrt-plugins-tizen.spec
pkgconfigs/wrt-plugins-tizen-application.pc.in
pkgconfigs/wrt-plugins-tizen-contact.pc.in
src/Application/ApplicationManager.h
src/CMakeLists.txt
src/Systeminfo/CMakeLists.txt
src/Systeminfo/EventWatchSysteminfo.cpp
src/Systeminfo/Systeminfo.cpp
src/Systeminfo/Systeminfo.h