diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-07 07:22:24 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-07 07:22:24 +0100 |
| commit | af3f3672e5f77a06a24b1e648ee118f1420b45ae (patch) | |
| tree | 2f08e1da8d47d44fcbf78f660ee8d99bf162b5f2 /mesalib/Android.mk | |
| parent | 60f8ca2d5842b40b8585c58095787c84edfa9803 (diff) | |
| parent | 1ed503a856d9753a813951796bc6ba56c42ecd28 (diff) | |
| download | vcxsrv-af3f3672e5f77a06a24b1e648ee118f1420b45ae.tar.gz vcxsrv-af3f3672e5f77a06a24b1e648ee118f1420b45ae.tar.bz2 vcxsrv-af3f3672e5f77a06a24b1e648ee118f1420b45ae.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-mmx.c
Diffstat (limited to 'mesalib/Android.mk')
| -rw-r--r-- | mesalib/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/Android.mk b/mesalib/Android.mk index 29453bc34..0c07d5e02 100644 --- a/mesalib/Android.mk +++ b/mesalib/Android.mk @@ -135,9 +135,9 @@ endif ifneq ($(filter nouveau, $(MESA_GPU_DRIVERS)),) gallium_DRIVERS += \ libmesa_winsys_nouveau \ - libmesa_pipe_nvc0 \ - libmesa_pipe_nv50 \ libmesa_pipe_nvfx \ + libmesa_pipe_nv50 \ + libmesa_pipe_nvc0 \ libmesa_pipe_nouveau LOCAL_SHARED_LIBRARIES += libdrm_nouveau endif |