| Age | Commit message (Collapse) | Author |
|---|
|
|
|
Conflicts:
src/mesa/main/version.h
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
scons/gallium.py
scons/generic.py
src/mesa/main/version.h
|
|
|
|
|
|
(cherry picked from commit cbf46ed670ef5a5c8a641730234dd7ae964c3170)
|
|
|
|
Caused by some weird logic regarding the __WIN32__ define which made
the finite definition dependent on the header include order.
(cherry picked from commit 622bdecabd73167d2f2f3aff0e223a8c64433f99)
|
|
(cherry picked from commit 970823978c2f7d2cf0757aa6ddbd6289b34c476f)
|
|
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
|
|
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
|
|
Conflicts:
src/mesa/main/version.h
src/mesa/state_tracker/st_atom_shader.c
|
|
|
|
Conflicts:
configure.ac
progs/demos/morph3d.c
progs/demos/textures.c
progs/glsl/shtest.c
progs/glsl/texaaline.c
progs/tests/packedpixels.c
progs/xdemos/corender.c
src/mesa/main/version.h
|
|
|
|
|
|
|
|
|
|
|
|
|
|
these really shouldn't be exposed here
|
|
|
|
|
|
|
|
these really shouldn't be exposed here
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Conflicts:
SConstruct
configs/default
configs/linux-dri
|
|
|
|
|
|
|
|
|
|
|
