omar f94af2f5c5 Merge branch 'viewport' into docking ... # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui_draw.cpp		2019-01-20 22:13:35 +01:00
..
data	Examples: Renamed example folders. (#1870)	2018-06-10 15:42:14 +02:00
main.cpp	Merge branch 'viewport' into docking	2019-01-20 22:13:35 +01:00
marmalade_example.mkb	Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)	2018-08-30 19:00:33 +02:00