Merge branch 'docking_inter'

Browse Source

# Conflicts:
#	cimgui.cpp
#	cimgui.h
#	generator/output/definitions.json
#	generator/output/definitions.lua
#	generator/output/structs_and_enums.json
#	generator/output/structs_and_enums.lua
#	imgui

...

This commit is contained in:

Victor Bombi

2021-03-16 13:00:24 +01:00

parent c401f71eea ccdae842e4

commit 34a48996e6

9 changed files with 3777 additions and 3345 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1187

generator/output/structs_and_enums.lua

File diff suppressed because it is too large Load Diff