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

mesa: merge gallium-0.2 into gallium-master-merge

Browse Source 
Merge commit 'origin/gallium-0.2' into gallium-master-merge

Conflicts:

	Makefile
	docs/relnotes-7.4.html
	docs/relnotes.html
	src/mesa/drivers/dri/i965/brw_wm.h
	src/mesa/main/imports.c
	src/mesa/main/mtypes.h
	src/mesa/main/texcompress.c
	src/mesa/main/texenvprogram.c
	src/mesa/main/version.h
	src/mesa/vbo/vbo_exec_api.c
	src/mesa/vbo/vbo_save_draw.c
This commit is contained in:
Brian Paul
2009-02-09 09:22:22 -07:00
parent 1a46c8a062 b907d4cd8f
commit e97681c7f5
1552 changed files with 304360 additions and 19639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,10 @@
/*
* 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.
*