summaryrefslogtreecommitdiffstats
path: root/src/glut/os2/glut_win.cpp
diff options
context:
space:
mode:
authorBen Skeggs <[email protected]>2008-08-14 00:20:52 +1000
committerBen Skeggs <[email protected]>2008-08-14 00:20:52 +1000
commit56f5c0c001c476b813c94d071ac880fbe8d9768b (patch)
tree257e2d7c3870a741ad30ea7bc38621d9eb728483 /src/glut/os2/glut_win.cpp
parentdf4228deddea36b9d5b41ea395a216137e046205 (diff)
parentd8be393cb60d908f98f0edb74c1c7964e8f690fe (diff)
Merge remote branch 'origin/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/glut/os2/glut_win.cpp')
-rw-r--r--src/glut/os2/glut_win.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/glut/os2/glut_win.cpp b/src/glut/os2/glut_win.cpp
index 53ff5d5d953..63757d71522 100644
--- a/src/glut/os2/glut_win.cpp
+++ b/src/glut/os2/glut_win.cpp
@@ -1218,4 +1218,3 @@ glutReshapeFunc(GLUTreshapeCB reshapeFunc)
__glutCurrentWindow->reshape = __glutDefaultReshape;
}
}
- \ No newline at end of file