diff options
| author | Julien Cristau <[email protected]> | 2007-04-21 20:27:55 +0200 |
|---|---|---|
| committer | Julien Cristau <[email protected]> | 2007-04-21 20:27:55 +0200 |
| commit | d890ebdd2591c5c09038c8986341da17127ba930 (patch) | |
| tree | 46b3b277f2dca3a2ee7741be0f0ec41db7bd5313 /debian | |
| parent | 5ee9b3ce729c41dff80dc7ee2db8fdc30585c9e2 (diff) | |
| parent | 5ca8d4ccf24af1c174ff791f15cf9f19defd9b7e (diff) | |
Merge branch 'upstream-experimental' into debian-experimental
Conflicts:
doxygen/Makefile
doxygen/common.doxy
doxygen/doxy.bat
doxygen/glapi.doxy
doxygen/header.html
doxygen/main.doxy
doxygen/math.doxy
doxygen/shader.doxy
doxygen/swrast.doxy
doxygen/swrast_setup.doxy
doxygen/tnl.doxy
doxygen/tnl_dd.doxy
progs/tests/Makefile
progs/tests/fbotest1.c
progs/tests/fbotest2.c
progs/tests/fbotexture.c
progs/tests/mipmap_limits.c
progs/tests/sharedtex.c
progs/tools/trace/gltrace_support.cc
progs/trivial/Makefile
src/egl/docs/EGL_MESA_screen_surface
src/egl/main/egllog.c
src/glx/mini/Makefile
src/glx/mini/driver.h
src/mesa/drivers/allegro/amesa.c
src/mesa/drivers/windows/gldirect/dx7/gld_driver_dx7.c
src/mesa/drivers/windows/gldirect/dx7/gld_ext_dx7.c
src/mesa/drivers/windows/gldirect/dx7/gld_primitive_dx7.c
src/mesa/drivers/windows/gldirect/dx8/gld_driver_dx8.c
src/mesa/drivers/windows/gldirect/dx8/gld_ext_dx8.c
src/mesa/drivers/windows/gldirect/dx8/gld_primitive_dx8.c
src/mesa/drivers/windows/gldirect/dx9/gld_driver_dx9.c
src/mesa/drivers/windows/gldirect/dx9/gld_ext_dx9.c
src/mesa/drivers/windows/gldirect/dx9/gld_primitive_dx9.c
src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c
Diffstat (limited to 'debian')
0 files changed, 0 insertions, 0 deletions