mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-02-07 04:30:08 +00:00
Code Activity

Merge branch 'master' into docking

Browse source 
# Conflicts:
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp
#	imgui_internal.h
This commit is contained in:
omar 2018-10-12 13:01:20 +02:00
commit c398153b40
17 changed files with 167 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/imgui_impl_sdl.cpp
View file

@ -138,7 +138,7 @@ bool ImGui_ImplSDL2_ProcessEvent(SDL_Event* event)
return false;
}
static bool ImGui_ImplSDL2_Init(SDL_Window* window, void* sdl_gl_context)
static bool ImGui_ImplSDL2_Init(SDL_Window* window, void* sdl_gl_context)
{
g_Window = window;