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

Merge branch 'master' into docking + fixes for #3259

Browse Source 
# Conflicts:
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp
This commit is contained in:
ocornut
2020-05-25 18:32:15 +02:00
parent 0fe5170bc4 5ddf60d8ce
commit 5d472c4895
17 changed files with 195 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/example_sdl_opengl2/Makefile
View File

@ -8,7 +8,7 @@
# Mac OS X:
# brew install sdl2
# MSYS2:
# pacman -S mingw-w64-i686-SDL
# pacman -S mingw-w64-i686-SDL2
#
#CXX = g++