diff options
| author | David Nusinow <[email protected]> | 2007-06-27 21:29:16 -0400 |
|---|---|---|
| committer | David Nusinow <[email protected]> | 2007-06-27 21:29:16 -0400 |
| commit | b2e67fdb7ca78c468ecf583ef1fcf9643df55817 (patch) | |
| tree | 4c6b1894e9a3db74b17626dd893ab7924e8ed225 /include | |
| parent | 1953cfc9542dafe2b92d2c9a0da819513ee2c1a4 (diff) | |
| parent | 131baefac30e46287f0c83f43fc0e7b858877830 (diff) | |
Merge branch 'upstream-experimental' into debian-experimental
Conflicts:
.gitignore
progs/miniglx/miniglxtest.c
src/glx/mini/Makefile
src/glx/mini/miniglx.c
src/mesa/drivers/dri/r300/.gitignore
Diffstat (limited to 'include')
| -rw-r--r-- | include/GL/gl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h index 78a00aeb8b3..fa0f891ade1 100644 --- a/include/GL/gl.h +++ b/include/GL/gl.h @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.5.1 + * Version: 7.0 * - * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), |