Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-11-05 15:41:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	docs/CHANGELOG.txt
This commit is contained in:
omar
2020-02-10 14:03:12 +01:00
parent 7e2d172ae5 58b3e02b95
commit 8432d1bfc7
12 changed files with 93 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
imgui_demo.cpp
View File

@@ -1,4 +1,4 @@
// dear imgui, v1.75 WIP
// dear imgui, v1.75
// (demo code)
// Help:
@@ -66,6 +66,8 @@ Index of this file:
#endif
#include "imgui.h"
#ifndef IMGUI_DISABLE
#include <ctype.h> // toupper
#include <limits.h> // INT_MIN, INT_MAX
#include <math.h> // sqrtf, powf, cosf, sinf, floorf, ceilf
@@ -5112,3 +5114,5 @@ void ImGui::ShowUserGuide() {}
void ImGui::ShowStyleEditor(ImGuiStyle*) {}
#endif
#endif // #ifndef IMGUI_DISABLE