Merge remote-tracking branch 'svn/trunk' into git_master

This commit is contained in:
Diederick Niehorster 2014-10-13 22:18:16 +08:00
commit 22511a7757

View File

@ -628,8 +628,11 @@ its event loop.
<p>
The <tt>glutLeaveMainLoop</tt> function causes <i>freeglut</i> to stop the event loop. If the
<tt>GLUT_ACTION_ON_WINDOW_CLOSE</tt> option has been set to <tt>GLUT_ACTION_CONTINUE_EXECUTION</tt>,
control will return to the function which called <tt>glutMainLoop</tt>; otherwise the application will exit.
<tt>GLUT_ACTION_ON_WINDOW_CLOSE</tt> option has been set to
<tt>GLUT_ACTION_GLUTMAINLOOP_RETURNS</tt> or
<tt>GLUT_ACTION_CONTINUE_EXECUTION</tt>, control will return to the
function which called <tt>glutMainLoop</tt>; otherwise the application
will exit.
</p>
<p>