Merge branch 'release' into develop
authorsyeon.hwang <syeon.hwang@samsung.com>
Fri, 7 Sep 2012 08:23:10 +0000 (17:23 +0900)
committersyeon.hwang <syeon.hwang@samsung.com>
Fri, 7 Sep 2012 08:23:10 +0000 (17:23 +0900)
commit01cdd8785c5de164a2d09eb5e8cbc6a6dc88e916
tree8e9a69b2d49bfe773a0e494b08d20a023fbefdd4
parent1e943482e469bf74a39d021b6db2516c2985ce64
parentce09eb8ab3894f855c93e1e52f0d8f490286c687
Merge branch 'release' into develop

Conflicts:
package/pkginfo.manifest
tizen/src/Makefile
tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/DetailInfoDialog.java
vl.c
tizen/src/skin/client/src/org/tizen/emulator/skin/dialog/DetailInfoDialog.java