diff options
| author | Brian Paul <brianp@vmware.com> | 2010-04-22 11:10:19 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-04-22 11:10:19 -0600 |
| commit | b4a191e351ff1ac1cd27cd7e02d169958a78ca86 (patch) | |
| tree | 2950f02f126fb3dcd63d908b11717f3e0cc2ff25 /progs/demos | |
| parent | 2eea1714fdffbd665a2076c7b8fed7b264a42968 (diff) | |
| parent | b1a9c76b574f4da6b87c5a0750bfbe5bc98d1f4e (diff) | |
Merge branch '7.8'
Conflicts:
src/mesa/state_tracker/st_format.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 265d90cd95..60fc4146c8 100644 --- a/progs/demos/rain.cxx +++ b/progs/demos/rain.cxx @@ -158,7 +158,7 @@ static void printhelp(void) glRasterPos2i(60,240); printstring(GLUT_BITMAP_TIMES_ROMAN_24,"l - Increase rain length"); glRasterPos2i(60,210); - printstring(GLUT_BITMAP_TIMES_ROMAN_24,"k - Increase rain length"); + printstring(GLUT_BITMAP_TIMES_ROMAN_24,"k - Decrease rain length"); } static void drawrain(void) |