Merge tag 'mesa_7_0_2' into debian-unstable
Conflicts: .gitignore progs/demos/.gitignore progs/directfb/Makefile progs/egl/Makefile progs/fbdev/Makefile progs/fp/Makefile progs/miniglx/Makefile progs/samples/.gitignore progs/slang/Makefile progs/tests/.gitignore progs/tests/Makefile progs/tools/trace/Makefile progs/trivial/Makefile progs/vp/Makefile progs/xdemos/.gitignore src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/mesa/Makefile src/glut/directfb/Makefile src/glx/mini/Makefile
Showing
- Makefile 13 additions, 4 deletionsMakefile
- bin/mklib 18 additions, 12 deletionsbin/mklib
- configs/aix-gcc 4 additions, 0 deletionsconfigs/aix-gcc
- configs/beos 4 additions, 0 deletionsconfigs/beos
- configs/bluegene-osmesa 4 additions, 0 deletionsconfigs/bluegene-osmesa
- configs/bluegene-xlc-osmesa 29 additions, 0 deletionsconfigs/bluegene-xlc-osmesa
- configs/catamount-osmesa-pgi 32 additions, 0 deletionsconfigs/catamount-osmesa-pgi
- configs/darwin 4 additions, 0 deletionsconfigs/darwin
- configs/darwin-static 4 additions, 0 deletionsconfigs/darwin-static
- configs/darwin-static-x86ppc 4 additions, 0 deletionsconfigs/darwin-static-x86ppc
- configs/darwin-x86ppc 4 additions, 0 deletionsconfigs/darwin-x86ppc
- configs/default 6 additions, 3 deletionsconfigs/default
- configs/freebsd 4 additions, 0 deletionsconfigs/freebsd
- configs/freebsd-dri 4 additions, 0 deletionsconfigs/freebsd-dri
- configs/hpux10-gcc 4 additions, 0 deletionsconfigs/hpux10-gcc
- configs/linux 4 additions, 0 deletionsconfigs/linux
- configs/linux-alpha 4 additions, 0 deletionsconfigs/linux-alpha
- configs/linux-alpha-static 4 additions, 0 deletionsconfigs/linux-alpha-static
- configs/linux-directfb 4 additions, 0 deletionsconfigs/linux-directfb
- configs/linux-dri 7 additions, 2 deletionsconfigs/linux-dri
Loading
Please register or sign in to comment