Merge remote-tracking branch 'score/develop' into tizen-vigs-develop
authorStanislav Vorobiov <s.vorobiov@samsung.com>
Fri, 31 May 2013 09:23:51 +0000 (13:23 +0400)
committerStanislav Vorobiov <s.vorobiov@samsung.com>
Fri, 31 May 2013 09:23:51 +0000 (13:23 +0400)
commit5d2d65bc5afb281fc66942cca75259b666199c8b
tree42f985506ceb67d9ffc204aa90f6565eaecc8bdf
parenta020c1d34d5513f8c30e427eeee8a325a71bf599
parenta0d0ae66538d01676bd8ca5d138739be50f42aeb
Merge remote-tracking branch 'score/develop' into tizen-vigs-develop

Conflicts:
package/changelog
package/pkginfo.manifest
Makefile.target
configure
tizen/src/Makefile.tizen
tizen/src/emulator.c