mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-11 00:04:24 +00:00
Code Activity

Merge branch 'viewport' into docking

Browse source 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_demo.cpp
#	imgui_internal.h
This commit is contained in:
omar 2018-09-14 11:38:10 +02:00
commit e32256b4b4
58 changed files with 145 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/example_allegro5/main.cpp
View file

@ -1,5 +1,5 @@
// ImGui - standalone example application for Allegro 5
// If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp.
// dear imgui: standalone example application for Allegro 5
// If you are new to dear imgui, see examples/README.txt and documentation at the top of imgui.cpp.
#include <stdint.h>
#include <allegro5/allegro.h>