Browse code Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_glfw.cpp # examples/imgui_impl_win32.cpp # imgui.cpp # imgui_internal.h docking
commit 4158cba1ffd338c46d52164c2be0762031e66f53 2 parents b955e48 + fc3c3de omar authored on 13 May 2019

Showing 15 changed files

• docs/CHANGELOG.txt
• examples/imgui_impl_allegro5.cpp
• examples/imgui_impl_glfw.cpp
• examples/imgui_impl_glut.cpp
• examples/imgui_impl_marmalade.cpp
• examples/imgui_impl_osx.mm
• examples/imgui_impl_win32.cpp
• imgui.cpp
• imgui.h
• imgui_demo.cpp
• imgui_internal.h
• imgui_widgets.cpp
• misc/freetype/README.md
• misc/freetype/imgui_freetype.cpp
• misc/freetype/imgui_freetype.h

Ignore Space Show notes View docs/CHANGELOG.txt

Ignore Space Show notes View examples/imgui_impl_allegro5.cpp

Ignore Space Show notes View examples/imgui_impl_glfw.cpp

Ignore Space Show notes View examples/imgui_impl_glut.cpp

Ignore Space Show notes View examples/imgui_impl_marmalade.cpp

Ignore Space Show notes View examples/imgui_impl_osx.mm

Ignore Space Show notes View examples/imgui_impl_win32.cpp

Ignore Space Show notes View imgui.cpp

Ignore Space Show notes View imgui.h

Ignore Space Show notes View imgui_demo.cpp

Ignore Space Show notes View imgui_internal.h

Ignore Space Show notes View imgui_widgets.cpp

Ignore Space Show notes View misc/freetype/README.md

Ignore Space Show notes View misc/freetype/imgui_freetype.cpp

Ignore Space Show notes View misc/freetype/imgui_freetype.h

Show line notes below