mirror of https://github.com/ocornut/imgui
Merge branch 'master' into navigation
# Conflicts: # imgui.h
This commit is contained in:
commit
c0b366b316
|
@ -1,4 +1,4 @@
|
|||
// dear imgui, v1.52 WIP
|
||||
// dear imgui, v1.52
|
||||
// (main code and documentation)
|
||||
|
||||
// ** EXPERIMENTAL GAMEPAD/KEYBOARD NAVIGATION BRANCH
|
||||
|
|
4
imgui.h
4
imgui.h
|
@ -1,4 +1,4 @@
|
|||
// dear imgui, v1.52 WIP
|
||||
// dear imgui, v1.52
|
||||
// (headers)
|
||||
|
||||
// See imgui.cpp file for documentation.
|
||||
|
@ -16,7 +16,7 @@
|
|||
#include <stddef.h> // ptrdiff_t, NULL
|
||||
#include <string.h> // memset, memmove, memcpy, strlen, strchr, strcpy, strcmp
|
||||
|
||||
#define IMGUI_VERSION "1.52 WIP"
|
||||
#define IMGUI_VERSION "1.52"
|
||||
#define IMGUI_HAS_NAV // navigation branch
|
||||
|
||||
// Define attributes of all API symbols declarations, e.g. for DLL under Windows.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// dear imgui, v1.52 WIP
|
||||
// dear imgui, v1.52
|
||||
// (demo code)
|
||||
|
||||
// Message to the person tempted to delete this file when integrating ImGui into their code base:
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// dear imgui, v1.52 WIP
|
||||
// dear imgui, v1.52
|
||||
// (drawing and font code)
|
||||
|
||||
// Contains implementation for
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// dear imgui, v1.52 WIP
|
||||
// dear imgui, v1.52
|
||||
// (internals)
|
||||
|
||||
// You may use this file to debug, understand or extend ImGui features but we don't provide any guarantee of forward compatibility!
|
||||
|
|
Loading…
Reference in New Issue