diff options
author | Alan Hourihane <alanh@vmware.com> | 2009-01-16 16:44:53 +0000 |
---|---|---|
committer | Alan Hourihane <alanh@vmware.com> | 2009-01-16 16:44:53 +0000 |
commit | 2e28c1fda24988241ef7abb91b7d896e38f5df26 (patch) | |
tree | 593e70705d1f60babd77697b75f7618a94c6703b /src/mesa/shader/slang/slang_typeinfo.c | |
parent | 47ca0234dc9f83808cb141944537c78eaade5d55 (diff) | |
parent | e442fe5ba53acf16c78339f19921d70dba3928f6 (diff) |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/shader/slang/slang_compile.c
Diffstat (limited to 'src/mesa/shader/slang/slang_typeinfo.c')
-rw-r--r-- | src/mesa/shader/slang/slang_typeinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/shader/slang/slang_typeinfo.c b/src/mesa/shader/slang/slang_typeinfo.c index a5bcde404f..1ef43f58c0 100644 --- a/src/mesa/shader/slang/slang_typeinfo.c +++ b/src/mesa/shader/slang/slang_typeinfo.c @@ -23,7 +23,7 @@ */ /** - * \file slang_assemble_typeinfo.c + * \file slang_typeinfo.c * slang type info * \author Michal Krol */ |