diff options
| author | Younes Manton <[email protected]> | 2010-03-07 12:47:45 -0500 |
|---|---|---|
| committer | Younes Manton <[email protected]> | 2010-03-12 01:37:49 -0500 |
| commit | a8238bb08a95e7ea4430450c304a6bee210df1a6 (patch) | |
| tree | 00f4e852473dc1d6a86aece436f3e5bf89d029c7 /docs/devinfo.html | |
| parent | 80468464897682b8e10aeab310f20fdd7ddc6cb4 (diff) | |
| parent | 45df4bad9fc0379f05197bee10c03fd351f24094 (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
configure.ac
src/gallium/auxiliary/vl/Makefile
src/gallium/auxiliary/vl/SConscript
src/gallium/auxiliary/vl/vl_compositor.c
src/gallium/auxiliary/vl/vl_compositor.h
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.h
src/gallium/drivers/nouveau/nouveau_winsys.h
src/gallium/drivers/softpipe/sp_video_context.c
src/gallium/include/pipe/p_video_state.h
src/gallium/include/state_tracker/drm_api.h
src/gallium/state_trackers/xorg/xvmc/surface.c
src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c
src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.h
src/gallium/winsys/drm/radeon/core/radeon_drm.c
src/gallium/winsys/g3dvl/nouveau/Makefile
Diffstat (limited to 'docs/devinfo.html')
| -rw-r--r-- | docs/devinfo.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/devinfo.html b/docs/devinfo.html index 0fb816749ed..df0e7265249 100644 --- a/docs/devinfo.html +++ b/docs/devinfo.html @@ -107,7 +107,7 @@ Global variables are not allowed. Function name examples: </p> <pre> - glFooBar() - a public GL entry point (in dispatch.c) + glFooBar() - a public GL entry point (in glapi_dispatch.c) _mesa_FooBar() - the internal immediate mode function save_FooBar() - retained mode (display list) function in dlist.c foo_bar() - a static (private) function |