Merge branch 'viewport' into docking

# Conflicts:
#	imgui.cpp
#	imgui.h
This commit is contained in:
omar
2018-10-18 10:57:54 +02:00
12 changed files with 102 additions and 60 deletions

View File

@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 48;
objects = {
/* Begin PBXBuildFile section */