omar
|
14cef31467
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-07-09 16:24:01 +02:00 |
|
omar
|
6201cad2b4
|
Examples: Comments, Demo: Log early out, TODO. (#1553)
|
2018-07-09 11:43:53 +02:00 |
|
omar
|
24aeca3d0c
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# examples/imgui_impl_vulkan.h
# examples/imgui_impl_win32.cpp
|
2018-06-12 16:24:24 +02:00 |
|
omar
|
cdf51cad2d
|
Comments, documentation
|
2018-06-11 19:52:40 +02:00 |
|
omar
|
9660657e95
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2018-06-10 15:59:35 +02:00 |
|
omar
|
5a13e4dcde
|
Examples: Renamed imgui_impl_sdl2.cpp to imgui_impl_sdl.cpp (#1870) + changelog bits
|
2018-06-10 15:58:21 +02:00 |
|
omar
|
8d58fbb5ed
|
Examples: Renamed example folders. (#1870)
|
2018-06-10 15:42:14 +02:00 |
|