
* master: fix issue on macos x refactor # Conflicts: # src/macosx/MacMiniFB.m # src/macosx/OSXWindowFrameView.h # src/macosx/OSXWindowFrameView.m
* master: fix issue on macos x refactor # Conflicts: # src/macosx/MacMiniFB.m # src/macosx/OSXWindowFrameView.h # src/macosx/OSXWindowFrameView.m