diff options
| author | Stanislav Vorobiov <s.vorobiov@samsung.com> | 2014-01-15 12:01:43 +0400 |
|---|---|---|
| committer | Stanislav Vorobiov <s.vorobiov@samsung.com> | 2014-01-15 12:13:47 +0400 |
| commit | d8417747313998a714295d34162585a75afbfc2e (patch) | |
| tree | 781b305a056cfdaaaf521bec0c5846ef44b06068 /GLESv1_CM | |
| parent | 3c0dae2594153edfc441ce2f7a46b066dbe52ecc (diff) | |
| parent | a8cebc0772cec1684c2b9c47c2bc7cd0f0abffa8 (diff) | |
| download | emulator-yagl-d8417747313998a714295d34162585a75afbfc2e.tar.gz emulator-yagl-d8417747313998a714295d34162585a75afbfc2e.tar.bz2 emulator-yagl-d8417747313998a714295d34162585a75afbfc2e.zip | |
Merge remote-tracking branch 'origin/tizen' into glesv3
Conflicts:
EGL/yagl_egl_calls.c
EGL/yagl_state.c
GLES_common/yagl_gles_calls.c
GLES_common/yagl_host_gles_calls.c
GLESv2/yagl_gles2_context.c
Change-Id: Ibc911f6538e6e3d805e95196d1748c3381db2495
Diffstat (limited to 'GLESv1_CM')
0 files changed, 0 insertions, 0 deletions