GitBucket
|
Merge branch 'master' into docking
# Conflicts: # imgui.cpp |
|---|
|
|
| docs/CHANGELOG.txt |
|---|
| examples/example_apple_opengl2/example_apple_opengl2.xcodeproj/project.pbxproj |
|---|
| examples/imgui_impl_osx.mm |
|---|
| imconfig.h |
|---|
| imgui.cpp |
|---|
| imgui.h |
|---|
| imgui_demo.cpp |
|---|
| imgui_draw.cpp |
|---|
| imgui_internal.h |
|---|
| imgui_widgets.cpp |
|---|