projects / profile / ivi / mesa.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 35e60ae 88be217)
Merge branch '7.8'
authorDan Nicholson <dbn.lists@gmail.com>
Tue, 20 Apr 2010 03:22:48 +0000 (20:22 -0700)
committerDan Nicholson <dbn.lists@gmail.com>
Tue, 20 Apr 2010 03:22:48 +0000 (20:22 -0700)
commit02224ec4e0de8072c9d730821f88e0a00212ff50
tree565fe9ab2c6380cd81ead1ef468888a837c2edd5tree | snapshot
parent35e60aed0bcc63d906dfdd64fe5014b2ca4394f0commit | diff
parent88be2171e7336201e5ee97ade36ba3de4fe939bfcommit | 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.
src/gallium/targets/libgl-xlib/Makefile diff1 | | blob | history
Domain: Graphics System / GL;