Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-06 04:58:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking + fix for RenderMouseCursor()

Browse Source 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_draw.cpp
#	imgui_internal.h
This commit is contained in:
omar
2019-09-24 17:14:51 +02:00
parent 3233d85d2f d5efe16157
commit 6994bf10bc
15 changed files with 257 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
misc/fonts/README.txt
View File

@ -1,7 +1,9 @@
dear imgui, v1.73 WIP
(Font Readme)
---------------------------------------
----------------------------------------------------------------------
dear imgui, v1.73
----------------------------------------------------------------------
misc/fonts/README.txt
This is the Readme dedicated to fonts.
----------------------------------------------------------------------
The code in imgui.cpp embeds a copy of 'ProggyClean.ttf' (by Tristan Grimmer),
a 13 pixels high, pixel-perfect font used by default.