diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-12-21 19:18:41 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-12-21 19:18:41 +0000 |
| commit | a5585cb533af3d4e5d5324d5f526447b98597402 (patch) | |
| tree | 6706dbb8b4f994b919e247647c3e8853d067b45c /progs/demos/morph3d.c | |
| parent | d288a30610767f87e3e7c069730d4bc255246568 (diff) | |
| parent | 574715d8368f99c0a5720a9676385d58d6cfdf30 (diff) | |
Merge commit 'origin/master' into i965g-restart
Conflicts:
SConstruct
configs/default
configs/linux-dri
Diffstat (limited to 'progs/demos/morph3d.c')
| -rw-r--r-- | progs/demos/morph3d.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/progs/demos/morph3d.c b/progs/demos/morph3d.c index 6aca8270ff..01a06aba0f 100644 --- a/progs/demos/morph3d.c +++ b/progs/demos/morph3d.c @@ -887,5 +887,6 @@ int main(int argc, char **argv) glutIdleFunc( idle_ ); glutDisplayFunc( draw ); glutMainLoop(); - + + return 0; } |