Lior Halphon 5a14eb93c6 Merge branch 'master' into JoyKit
# Conflicts:
#	Cocoa/Document.m
#	Cocoa/GBView.h
#	Cocoa/GBView.m
#	Cocoa/joypad.m
#	Cocoa/main.m
#	Core/display.c
#	Core/gb.h
#	Core/save_state.c
2020-04-29 15:52:03 +03:00
..
2019-07-17 00:52:01 +03:00
2020-04-29 15:52:03 +03:00
2017-10-09 11:36:23 -05:00
2017-10-09 11:36:23 -05:00
2020-04-25 15:12:10 +03:00