omar 81a2546cea Merge branch 'viewport' into docking ...

# Conflicts:
#	examples/example_allegro5/main.cpp
#	examples/example_win32_directx9/main.cpp

2018-12-20 23:06:29 +01:00

..

data

Examples: Renamed example folders. (#1870)

2018-06-10 15:42:14 +02:00

main.cpp

Merge branch 'viewport' into docking

2018-12-20 23:06:29 +01:00

marmalade_example.mkb

Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)

2018-08-30 14:29:11 +02:00