diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-18 09:29:58 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-18 09:29:58 +0100 |
| commit | 72ba71645132923bb8e0b93f7683aef8bc485aa2 (patch) | |
| tree | baeaeff7e7ce5bf65f056625b435b8d55d4a04fa /mesalib/src/mesa/program/Android.mk | |
| parent | 4d64875593956234795d9947ac1d225e5b110f0f (diff) | |
| parent | 7c20de6c7fb53ed404d4df0d975328318810ce01 (diff) | |
| download | vcxsrv-72ba71645132923bb8e0b93f7683aef8bc485aa2.tar.gz vcxsrv-72ba71645132923bb8e0b93f7683aef8bc485aa2.tar.bz2 vcxsrv-72ba71645132923bb8e0b93f7683aef8bc485aa2.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libXext mesa xkeyboard-config pixman 18 nov 2013
Conflicts:
libXext/src/eat.h
Diffstat (limited to 'mesalib/src/mesa/program/Android.mk')
| -rw-r--r-- | mesalib/src/mesa/program/Android.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mesalib/src/mesa/program/Android.mk b/mesalib/src/mesa/program/Android.mk index 29a1b6a63..e85afe672 100644 --- a/mesalib/src/mesa/program/Android.mk +++ b/mesalib/src/mesa/program/Android.mk @@ -47,8 +47,6 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES intermediates := $(call local-intermediates-dir) -MESA_ENABLED_APIS := ES1 ES2 - # TODO(chadv): In Makefile.sources, move these vars to a different list so we can # remove this kludge. generated_sources_basenames := \ |