Carlos Aragones 6452ec1bfd Merge branch 'master' into ios_tmp ... * master: fix issue on macos x refactor # Conflicts: # src/macosx/MacMiniFB.m # src/macosx/OSXWindowFrameView.h # src/macosx/OSXWindowFrameView.m		2020-04-26 14:20:48 +02:00
..
ios	test 2 & refactor	2020-04-26 13:16:25 +02:00
input_events_cpp.cpp	Add timers and ability to set a target fps for the application (#36)	2020-04-22 13:00:15 +02:00
input_events.c	Add timers and ability to set a target fps for the application (#36)	2020-04-22 13:00:15 +02:00
multiple_windows.c	fix issue on macos x	2020-04-26 14:10:18 +02:00
noise.c	refactor	2020-04-26 13:21:08 +02:00