mesa: Remove left over merge conflicts
authorJakob Bornecrantz <jakob@tungstengraphics.com>
Mon, 22 Sep 2008 10:47:57 +0000 (12:47 +0200)
committerJakob Bornecrantz <jakob@tungstengraphics.com>
Mon, 22 Sep 2008 10:47:57 +0000 (12:47 +0200)
commitc9122c0c0308345e2df2448bcb189d0f5d505909
treec60ef3c141cf22334b61d2adbdab6309c2ec9d13
parentdace236c5fffa29d59e4d12fa865889bbecbdd24
mesa: Remove left over merge conflicts
src/glx/x11/Makefile
src/mesa/x86/common_x86_asm.S