Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-07 05:28:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	examples/README.txt
#	examples/imgui_impl_dx9.cpp
#	imgui.cpp
#	imgui.h
This commit is contained in:
omar
2019-05-06 10:16:43 +02:00
parent 4f22a45cb5 d88121ff5b
commit 76e61958fd
15 changed files with 349 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/example_glut_opengl2/main.cpp
View File

@ -3,6 +3,7 @@
// !!! GLUT/FreeGLUT IS OBSOLETE SOFTWARE. Using GLUT is not recommended unless you really miss the 90's. !!!
// !!! If someone or something is teaching you GLUT in 2019, you are being abused. Please show some resistance. !!!
// !!! Prefer using GLFW Or SDL instead!
#include "imgui.h"
#include "../imgui_impl_glut.h"