 ocornut
|
2d8c134747
|
Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
imgui.cpp
|
2015-08-01 07:26:09 -06:00 |
|
|
ocornut
|
abf823c6f6
|
Tidying up
|
2015-07-30 22:49:10 -06:00 |
|
|
ocornut
|
a7e5945206
|
Merge
|
2015-07-30 21:37:59 -06:00 |
|
|
ocornut
|
709c4c3168
|
Merge remote-tracking branch 'origin' into 2015-07-cleanup
Conflicts:
imgui.cpp
|
2015-07-30 20:42:12 -06:00 |
|
|
ocornut
|
e32f0931e8
|
Missing includes for imgui_draw.cpp (#219)
|
2015-07-21 17:08:20 -06:00 |
|
|
ocornut
|
dace68b6fd
|
Big cleanup, split imgui.cpp into imgui_demo.cpp,imgui_draw.cpp imgui_internal.h (#219)
|
2015-07-21 17:00:28 -06:00 |
|