fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-14 05:20:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: fix merge conflict (in comment)

Browse source
This commit is contained in:
Brian Paul 2009-02-24 17:53:39 -07:00
parent 8e6337f582
commit bfdbbfb025
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/main/version.h
View file

@ -1,10 +1,6 @@
/*
* Mesa 3-D graphics library
<<<<<<< HEAD:src/mesa/main/version.h
* Version: 7.5
=======
* Version: 7.4
>>>>>>> origin/gallium-0.2:src/mesa/main/version.h
*
* Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
*