mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-20 01:34:20 +00:00
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts: imgui.cpp
This commit is contained in:
commit
fd44b9440b
7 changed files with 73 additions and 49 deletions
|
|
@ -1,6 +1,6 @@
|
|||
// ImGui Allegro 5 bindings
|
||||
// https://github.com/ocornut/imgui
|
||||
// by @birthggd, public domain
|
||||
// by @birthggd
|
||||
|
||||
#include <stdint.h> // uint64_t
|
||||
#include <cstring> // memcpy
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue