Merge branch 'master' into tizen_2.1
authorJaeho Lee <jaeho81.lee@samsung.com>
Sat, 6 Apr 2013 05:46:11 +0000 (14:46 +0900)
committerJaeho Lee <jaeho81.lee@samsung.com>
Sat, 6 Apr 2013 05:46:11 +0000 (14:46 +0900)
added new API

Conflicts:
packaging/app-core.spec

Signed-off-by: Jaeho Lee <jaeho81.lee@samsung.com>
1  2 
packaging/app-core.spec
src/appcore-efl.c

@@@ -1,7 -1,7 +1,7 @@@
  Name:       app-core
  Summary:    Application basic
  Version:    1.2
- Release:    44
 -Release:    42
++Release:    45
  Group:      Application Framework
  License:    Apache License, Version 2.0
  Source0:    app-core-%{version}.tar.gz
Simple merge