1
0
Fork 0
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:
ocornut 2015-07-10 21:45:25 -06:00
commit fd44b9440b
7 changed files with 73 additions and 49 deletions

View file

@ -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