1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-31 03:20:05 +00:00

Merge branch 'master' into navigation

# 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

View file

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