GitBucket
|
Merge branch 'master' into docking
# Conflicts: # imgui_demo.cpp |
|---|
|
|
| docs/CHANGELOG.txt |
|---|
| examples/example_win32_directx10/main.cpp |
|---|
| examples/example_win32_directx11/main.cpp |
|---|
| examples/example_win32_directx9/main.cpp |
|---|
| imgui.h |
|---|
| imgui_demo.cpp |
|---|
| imgui_internal.h |
|---|
| imgui_widgets.cpp |
|---|
| misc/cpp/imgui_stdlib.cpp |
|---|
| misc/cpp/imgui_stdlib.h |
|---|