diff options
| author | Evgeny Voevodin <e.voevodin@samsung.com> | 2012-07-27 10:23:49 +0400 |
|---|---|---|
| committer | Evgeny Voevodin <e.voevodin@samsung.com> | 2012-07-27 11:46:01 +0400 |
| commit | 3a18528e2651a7d2af8abe0872cc328bedccc02d (patch) | |
| tree | de850aed6f360cb612cf0dac0c11465ba382da29 /tizen/src/hw/mesa_gl.h | |
| parent | 63a90916f25dde0bcc3b33a0a9764bfe4fc52f47 (diff) | |
| download | qemu-3a18528e2651a7d2af8abe0872cc328bedccc02d.tar.gz qemu-3a18528e2651a7d2af8abe0872cc328bedccc02d.tar.bz2 qemu-3a18528e2651a7d2af8abe0872cc328bedccc02d.zip | |
Merge remote-tracking branch 'score/develop' into tizen-arm-v1.1.0-develop
Conflicts:
configure
fpu/softfloat.h
hw/virtio-pci.c
tizen/emulator_configure.sh
tizen/src/Makefile
tizen/src/Makefile.tizen
tizen/src/emulator.c
tizen/src/maru_sdl.c
tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
tizen/src/skin/maruskin_operation.c
vl.c
Diffstat (limited to 'tizen/src/hw/mesa_gl.h')
| -rw-r--r--[-rwxr-xr-x] | tizen/src/hw/mesa_gl.h | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/tizen/src/hw/mesa_gl.h b/tizen/src/hw/mesa_gl.h index b62c9a8113..b62c9a8113 100755..100644 --- a/tizen/src/hw/mesa_gl.h +++ b/tizen/src/hw/mesa_gl.h |