diff options
author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-11-25 09:28:30 +0000 |
---|---|---|
committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-11-25 09:28:30 +0000 |
commit | 4af0d940a35536f096a9289470af0268a79402b3 (patch) | |
tree | 811a00ed03b1bcd5a99713108f831b41484153ff /src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c | |
parent | c5b52b5e0e6f6e47c3953076fa788921b1c5a5e2 (diff) | |
parent | 55839ae064d64b7fcc180fcddb364bf31ab760dc (diff) |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
scons/gallium.py
src/gallium/auxiliary/pipebuffer/pb_buffer.h
Diffstat (limited to 'src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c')
-rw-r--r-- | src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c index e2594ea236..513ed28ca6 100644 --- a/src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c +++ b/src/gallium/auxiliary/pipebuffer/pb_bufmgr_fenced.c @@ -30,7 +30,7 @@ * \file * A buffer manager that wraps buffers in fenced buffers. * - * \author José Fonseca <jrfonseca@tungstengraphics.dot.com> + * \author Jose Fonseca <jrfonseca@tungstengraphics.dot.com> */ |