OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
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 * Mesa 3-D graphics library
<<<<<<< HEAD:src/mesa/main/version.h
* Version: 7.5 * Version: 7.5
=======
* Version: 7.4
>>>>>>> origin/gallium-0.2:src/mesa/main/version.h
* *
* Copyright (C) 1999-2008 Brian Paul All Rights Reserved. * Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
* *