Merge branch 'release' into develop
authorgiwoong.kim <giwoong.kim@samsung.com>
Mon, 17 Sep 2012 04:55:19 +0000 (13:55 +0900)
committergiwoong.kim <giwoong.kim@samsung.com>
Mon, 17 Sep 2012 04:55:19 +0000 (13:55 +0900)
Conflicts:
package/pkginfo.manifest
tizen/src/hw/gloffscreen_glx.c
tizen/src/hw/gloffscreen_wgl.c
tizen/src/hw/gloffscreen_xcomposite.c
tizen/src/hw/maru_camera_linux_pci.c
tizen/src/hw/maru_camera_win32_pci.c

1  2 
package/pkginfo.manifest

index bc91c45b5e41a770edad14052e7dbb63ffef238e,e101806ae3061bc5cfdf5e8d3bec305c2f266467..1fb7ba66a188e31b3e8ba7f2ddb624b68925b5c0
@@@ -1,4 -1,4 +1,4 @@@
- Version: 1.3.55
 -Version: 1.3.53
++Version: 1.3.56
  Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
  Source: emulator