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

This commit is contained in:
Diederick Niehorster 2016-01-18 00:55:17 +01:00
commit da7d22e896

View File

@ -425,8 +425,7 @@ struct tagSFG_Context
#define GLUT_DISPLAY_WORK (1<<6)
/*
* An enumeration containing the state of the GLUT execution:
* initializing, running, or stopping
* An enumeration containing the desired mapping state of a window
*/
typedef enum
{