omar e2c1f0a7cd Merge branch 'master' into docking ... # Conflicts: # docs/CHANGELOG.txt		2019-06-18 23:12:50 +02:00
..
data	Examples: Renamed example folders. (#1870)	2018-06-10 15:42:14 +02:00
main.cpp	Merge branch 'master' into docking	2019-06-18 23:12:50 +02: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