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

Merge branch 'master' into navigation

Browse Source 
# Conflicts:
#	imgui.h
This commit is contained in:
omar 2017-10-27 17:27:53 +02:00
commit c0b366b316
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
imgui.cpp
View File

@ -1,4 +1,4 @@
// dear imgui, v1.52 WIP // dear imgui, v1.52
// (main code and documentation) // (main code and documentation)
// ** EXPERIMENTAL GAMEPAD/KEYBOARD NAVIGATION BRANCH // ** EXPERIMENTAL GAMEPAD/KEYBOARD NAVIGATION BRANCH

4
imgui.h
View File

@ -1,4 +1,4 @@
// dear imgui, v1.52 WIP // dear imgui, v1.52
// (headers) // (headers)
// See imgui.cpp file for documentation. // See imgui.cpp file for documentation.
@ -16,7 +16,7 @@
#include <stddef.h> // ptrdiff_t, NULL #include <stddef.h> // ptrdiff_t, NULL
#include <string.h> // memset, memmove, memcpy, strlen, strchr, strcpy, strcmp #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 IMGUI_HAS_NAV // navigation branch
// Define attributes of all API symbols declarations, e.g. for DLL under Windows. // Define attributes of all API symbols declarations, e.g. for DLL under Windows.

2
imgui_demo.cpp
View File

@ -1,4 +1,4 @@
// dear imgui, v1.52 WIP // dear imgui, v1.52
// (demo code) // (demo code)
// Message to the person tempted to delete this file when integrating ImGui into their code base: // Message to the person tempted to delete this file when integrating ImGui into their code base:

2
imgui_draw.cpp
View File

@ -1,4 +1,4 @@
// dear imgui, v1.52 WIP // dear imgui, v1.52
// (drawing and font code) // (drawing and font code)
// Contains implementation for // Contains implementation for

2
imgui_internal.h
View File

@ -1,4 +1,4 @@
// dear imgui, v1.52 WIP // dear imgui, v1.52
// (internals) // (internals)
// You may use this file to debug, understand or extend ImGui features but we don't provide any guarantee of forward compatibility! // You may use this file to debug, understand or extend ImGui features but we don't provide any guarantee of forward compatibility!