diff options
| author | Christoph Bumiller <[email protected]> | 2010-09-02 18:31:49 +0200 |
|---|---|---|
| committer | Christoph Bumiller <[email protected]> | 2010-09-02 18:31:49 +0200 |
| commit | 222d2f2ac2c7d93cbc0643082c78278ad2c8cfce (patch) | |
| tree | b79152c238022b2a901201c22e5809ac520732bf /src/glsl/cl/Makefile | |
| parent | 443abc80db9e1a288ce770e76cccd43664348098 (diff) | |
| parent | e73c5501b2fe20290d1b691c85a5d82ac3a0431c (diff) | |
Merge remote branch 'origin/master' into nv50-compiler
Conflicts:
src/gallium/drivers/nv50/nv50_program.c
Diffstat (limited to 'src/glsl/cl/Makefile')
| -rw-r--r-- | src/glsl/cl/Makefile | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/glsl/cl/Makefile b/src/glsl/cl/Makefile deleted file mode 100644 index 04a52df8c33..00000000000 --- a/src/glsl/cl/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -#src/glsl/cl/Makefile - -TOP = ../../.. - -include $(TOP)/configs/current - -LIBNAME = glslcl - -C_SOURCES = \ - sl_cl_parse.c - -include ../Makefile.template - |