diff options
| author | Keith Whitwell <[email protected]> | 2008-09-18 18:57:46 +0100 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2008-09-18 19:03:02 +0100 |
| commit | 89ab66448e1bcd78caab6678261c2885dcff741c (patch) | |
| tree | be36d7e3eba3f64e54da34ff7ba64b3eb14e56aa /progs/demos | |
| parent | 1074e8e4e47bb4af73c7ef730d0fec40e826cc7e (diff) | |
| parent | 5e530d8384b0d9bb867d6407315587c84a443902 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
progs/trivial/Makefile
src/mesa/glapi/glthread.c
Diffstat (limited to 'progs/demos')
| -rw-r--r-- | progs/demos/rain.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/progs/demos/rain.cxx b/progs/demos/rain.cxx index 5c53d4248c5..59b6471ef8f 100644 --- a/progs/demos/rain.cxx +++ b/progs/demos/rain.cxx @@ -114,7 +114,7 @@ static void calcposobs(void) rainParticle::setRainingArea(obs[0]-7.0f,-0.2f,obs[2]-7.0f,obs[0]+7.0f,8.0f,obs[2]+7.0f); } -static void printstring(void *font, char *string) +static void printstring(void *font, const char *string) { int len,i; |