You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

ocornut 9948535118 Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui.h # imgui_draw.cpp		3 years ago
..
Makefile	CI: Fixes for OSX + explicitely request C++11.	3 years ago
example_glut_opengl2.vcxproj	Examples: update all VS project files to VS2015. Update DX12 project Windows SDK to latest.	4 years ago
example_glut_opengl2.vcxproj.filters	Moved 'misc/natvis/imgui.natvis' to 'misc/debuggers/imgui.natvis'	4 years ago
main.cpp	Merge branch 'master' into docking	4 years ago