5a14eb93c6
# 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