Merge branch 'master' into tizen_2.1

added new API

Conflicts:
	packaging/app-core.spec

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

diff --git a/packaging/app-core.spec b/packaging/app-core.spec
index 6aac880..6dec867 100644 (file)
--- a/packaging/app-core.spec
+++ b/packaging/app-core.spec
@@ -1,7 +1,7 @@
 Name:       app-core
 Summary:    Application basic
 Version:    1.2
-Release:    44
+Release:    45
 Group:      Application Framework
 License:    Apache License, Version 2.0
 Source0:    app-core-%{version}.tar.gz

diff --git a/src/appcore-efl.c b/src/appcore-efl.c
index 238b523..29f2c8a 100755 (executable)
--- a/src/appcore-efl.c
+++ b/src/appcore-efl.c
@@ -960,3 +960,10 @@ EXPORT_API int appcore_set_system_resource_reclaiming(bool enable)
 
        return 0;
 }
+
+EXPORT_API int appcore_set_app_state(int state)
+{
+       priv.state = state;
+
+       return 0;
+}