diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-18 08:09:44 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-18 08:09:44 +0200 |
| commit | 09bfe74fc7d4a6f97eddb034df371e66e314ea12 (patch) | |
| tree | b63caf666a8c36ddcc9a4202f7cecac49998e98d /mesalib/src/gallium/Android.mk | |
| parent | 5a54fa6e45ee10cf58ee1b6d2eb5522a24bb8745 (diff) | |
| parent | 7f669a708bd35bdf8e842f762ec68f9ad0ec0486 (diff) | |
| download | vcxsrv-09bfe74fc7d4a6f97eddb034df371e66e314ea12.tar.gz vcxsrv-09bfe74fc7d4a6f97eddb034df371e66e314ea12.tar.bz2 vcxsrv-09bfe74fc7d4a6f97eddb034df371e66e314ea12.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa pixman xserver git update 18 Sep 2013
Conflicts:
pixman/pixman/pixman-sse2.c
Diffstat (limited to 'mesalib/src/gallium/Android.mk')
| -rw-r--r-- | mesalib/src/gallium/Android.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mesalib/src/gallium/Android.mk b/mesalib/src/gallium/Android.mk index 4e5acc86f..85334cf69 100644 --- a/mesalib/src/gallium/Android.mk +++ b/mesalib/src/gallium/Android.mk @@ -48,10 +48,7 @@ endif ifneq ($(filter nouveau, $(MESA_GPU_DRIVERS)),) SUBDIRS += \ winsys/nouveau/drm \ - drivers/nouveau \ - drivers/nvfx \ - drivers/nv50 \ - drivers/nvc0 + drivers/nouveau endif # r300g/r600g/radeonsi |