imports/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-04-03 05:57:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	backends/imgui_impl_metal.mm
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_osx.mm
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
This commit is contained in:
ocornut
2023-04-19 16:35:50 +02:00
parent 0ea3b87bd6 9308cfdcfb
commit 4f692ba840
35 changed files with 634 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
imgui.h
View File

@@ -1,4 +1,4 @@
// dear imgui, v1.89.5
// dear imgui, v1.89.6 WIP
// (headers)
// Help:
@@ -22,8 +22,8 @@
// Library Version
// (Integer encoded as XYYZZ for use in #if preprocessor conditionals, e.g. '#if IMGUI_VERSION_NUM > 12345')
#define IMGUI_VERSION "1.89.5"
#define IMGUI_VERSION_NUM 18950
#define IMGUI_VERSION "1.89.6 WIP"
#define IMGUI_VERSION_NUM 18951
#define IMGUI_HAS_TABLE
#define IMGUI_HAS_VIEWPORT // Viewport WIP branch
#define IMGUI_HAS_DOCK // Docking WIP branch