diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-18 18:57:46 +0100 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-09-18 19:03:02 +0100 |
| commit | 89ab66448e1bcd78caab6678261c2885dcff741c (patch) | |
| tree | be36d7e3eba3f64e54da34ff7ba64b3eb14e56aa /src/glut | |
| 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 'src/glut')
| -rw-r--r-- | src/glut/glx/Makefile.mgw | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glut/glx/Makefile.mgw b/src/glut/glx/Makefile.mgw index 9fff2e1503d..5e1fde03de2 100644 --- a/src/glut/glx/Makefile.mgw +++ b/src/glut/glx/Makefile.mgw @@ -122,7 +122,7 @@ SRCS = \ glut_dstr.c \ glut_event.c \ glut_ext.c \ - glut_fbc.c \ + glut_fcb.c \ glut_fullscrn.c \ glut_gamemode.c \ glut_get.c \ |