git.libre-soc.org Git - mesa.git/commit - src/gallium/winsys/sw/xlib/SConscript

author	Dan Nicholson <dbn.lists@gmail.com>
	Tue, 20 Apr 2010 03:22:48 +0000 (20:22 -0700)
committer	Dan Nicholson <dbn.lists@gmail.com>
	Tue, 20 Apr 2010 03:22:48 +0000 (20:22 -0700)
commit	02224ec4e0de8072c9d730821f88e0a00212ff50
tree	565fe9ab2c6380cd81ead1ef468888a837c2edd5	tree
parent	35e60aed0bcc63d906dfdd64fe5014b2ca4394f0	commit \| diff
parent	88be2171e7336201e5ee97ade36ba3de4fe939bf	commit \| diff

Merge branch '7.8'

Conflicts:
progs/egl/Makefile

progs/egl/Makefile is gone on master with the egl demos split into
subdirectories. Will require an additional commit.