mesa: Fix merge conflicts
authorJakob Bornecrantz <jakob@vmware.com>
Thu, 15 Jan 2009 11:28:23 +0000 (12:28 +0100)
committerJakob Bornecrantz <jakob@vmware.com>
Thu, 15 Jan 2009 11:33:05 +0000 (12:33 +0100)
commit938f1e98043cc6c9cb6f204d022aef76c03bc210
tree53e8eab3a5d1759691b62c00507fc2ae8711d299
parent658b1bdb1cc5f9910be910dc156a2e81ed999756
mesa: Fix merge conflicts
src/mesa/shader/slang/slang_preprocess.c