Commit Graph

2 Commits

Author SHA1 Message Date
Julian Hinxlage 5b378366b8 Merge branch 'getter' into dev
# Conflicts:
#	src/Color.cpp
#	src/FontType.h
#	src/internal.cpp
#	src/vkvm.cpp
2019-11-07 17:35:30 +01:00
Julian Hinxlage 5439f89e2c + local memory as shared memory
+ getters/setters
2019-11-07 16:34:15 +01:00