ocornut a44d4da87c Merge branch 'master' into docking ...

# Conflicts:
#	backends/imgui_impl_win32.cpp

2021-06-08 18:38:51 +02:00

..

example_glut_opengl2.vcxproj

Examples: update all VS project files to VS2015. Update DX12 project Windows SDK to latest.

2021-06-08 17:08:49 +02:00

example_glut_opengl2.vcxproj.filters

Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis'

2021-03-11 16:21:46 +01:00

main.cpp

Merge branch 'master' into docking

2021-06-08 18:38:51 +02:00

Makefile

Examples: Fix MinGW detection in makefiles. Fix example_null build due to missing IME input libs. (#2590)

2021-02-24 17:18:53 +01:00