On 01/18/2013 10:00 AM, Matt Turner wrote:
> Squashed with two reverts:
> 
> Revert "android: Update for builtin_stubs.cpp move"
> 
> This reverts commit c0def90ede1e939173041b8785303de90f8fdc6c.
> 
> Partially revert "scons: Update for builtin_stubs.cpp"
> 
> This reverts commit 8ac4b82699ad0a59ae6ae6d3415702eaa5d4fe3b.
> ---
>  src/glsl/Android.mk       |    2 +-
>  src/glsl/Makefile.sources |    2 +-
>  src/glsl/SConscript       |    5 ++---
>  3 files changed, 4 insertions(+), 5 deletions(-)

This patch no longer cleanly applies to master. However, I manually
applied and tested it for Android.

Tested-on-Android-by: Chad Versace <chad.vers...@linux.intel.com>

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to