fix conflict breakage
authorAlan Hourihane <alanh@tungstengraphics.com>
Mon, 8 Dec 2008 15:03:29 +0000 (15:03 +0000)
committerAlan Hourihane <alanh@tungstengraphics.com>
Mon, 8 Dec 2008 15:03:29 +0000 (15:03 +0000)
commite8a1b31ddf39f0b09eb85653cebb9808a5daf0a9
treeed3d2a8ac865f1c697bb0ba9e43e02a9640136b8
parent33a1f495d4bb19288680b9812c6ec1235302d215
fix conflict breakage
progs/glsl/Makefile