ocornut
|
9b19f8c19d
|
Merge branch 'master' into 2015-07-cleanup
Conflicts:
imgui.cpp
|
2015-08-05 16:57:31 -06:00 |
|
ocornut
|
1b0a8f9ac3
|
Comments
|
2015-08-05 10:00:05 -06:00 |
|
ocornut
|
4b29cc9e10
|
Exposed relevant functions in imgui_internal.h (#219)
|
2015-08-01 21:57:24 -06:00 |
|
ocornut
|
f63beeae86
|
Internal version of LogText() -> LogRenderedText() + shallow tidying up
|
2015-07-30 23:48:59 -06:00 |
|
ocornut
|
abf823c6f6
|
Tidying up
|
2015-07-30 22:49:10 -06:00 |
|
ocornut
|
7552f48d7b
|
ImLoadFileToMemory() default parameters
|
2015-07-21 17:46:49 -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 |
|