Merge branch 'sdk-develop' into tizen
authorYeongkyoon Lee <yeongkyoon.lee@samsung.com>
Thu, 26 Sep 2013 06:28:59 +0000 (15:28 +0900)
committerYeongkyoon Lee <yeongkyoon.lee@samsung.com>
Thu, 26 Sep 2013 06:28:59 +0000 (15:28 +0900)
commit54f4540442bce5ca05794ef337bd6aa28c8b1c7b
tree66b4df6162f35e0f79e4b67afecdbed2384f954a
parent941be996db5c2b5fdaeff1e3f95bef0c99001512
parent459c9696442ce54b7a4711c566f72c807fe26b8c
Merge branch 'sdk-develop' into tizen

Conflicts:
AUTHOR
package/build.ubuntu-32
package/changelog
package/pkginfo.manifest

Change-Id: I38ba8c8a9ea8abe07df0a8aa7d8778c2fc51028a
Signed-off-by: Yeongkyoon Lee <yeongkyoon.lee@samsung.com>
AUTHOR
package/build.ubuntu-32
package/pkginfo.manifest