mesa: fix merge conflict (in comment)
authorBrian Paul <brianp@vmware.com>
Wed, 25 Feb 2009 00:53:39 +0000 (17:53 -0700)
committerBrian Paul <brianp@vmware.com>
Wed, 25 Feb 2009 00:53:39 +0000 (17:53 -0700)
commitbfdbbfb0251bcd17c1a559668d0f4a0d36847a84
tree19ecc55cd6a770d7db75cb4f807488f18f3c1707
parent8e6337f582d02d7a8884625b820266590d9ad81c
mesa: fix merge conflict (in comment)
src/mesa/main/version.h