mirror of
https://github.com/dingusdev/dingusppc.git
synced 2025-01-29 13:33:49 +00:00
288d97f24c
This commit fixes conflict resolution mistakes in the following commits: "atimach64gx: Let crtc_update calculate fb_ptr." "atimach64gx: Redraw only when necessary." "atimach64gx: Log unhandled overlay registers." was mistakenly included in "atimach64gx: Let crtc_update calculate fb_ptr.". The OVR_ registers were included because they may be needed for 2D acceleration in System 7.5.3 and later.