Skip to content

Minor cleanup - #16519

Merged
kd-11 merged 4 commits into
RPCS3:masterfrom
digant73:minor_cleanup
Jan 7, 2025
Merged

Minor cleanup#16519
kd-11 merged 4 commits into
RPCS3:masterfrom
digant73:minor_cleanup

Conversation

@digant73

@digant73 digant73 commented Jan 6, 2025

Copy link
Copy Markdown
Contributor

A minor cleanup on merged #15720.

  • GUI changes I submitted there have been merged not were expected (they should be after PPU compiler hint not toggle hint)

Comment thread rpcs3/rpcs3qt/tooltips.h
Comment thread rpcs3/rpcs3qt/emu_settings_type.h
Comment thread rpcs3/Emu/system_config.h Outdated
Comment thread rpcs3/rpcs3qt/emu_settings_type.h
Comment thread rpcs3/rpcs3qt/settings_dialog.cpp
@Megamouse Megamouse added the GUI label Jan 7, 2025
@Megamouse

Copy link
Copy Markdown
Contributor

Yet again, I cannot squash.
Please change your repo settings or squash yourself and rebase properly

@digant73

digant73 commented Jan 7, 2025

Copy link
Copy Markdown
Contributor Author

I didn't change anything compared to previous PRs merged without issues.

image

image

@Megamouse

Copy link
Copy Markdown
Contributor

Whatever it is, it doesn't allow me to merge any of your PRs specifically (unless I merge as is with a bunch of cleanup commits, which is not desired)

@digant73

digant73 commented Jan 7, 2025

Copy link
Copy Markdown
Contributor Author

it seems it has been done by elad335

@kd-11
kd-11 merged commit ec77f2a into RPCS3:master Jan 7, 2025
Xcedf pushed a commit to Xcedf/rpcs3 that referenced this pull request Jan 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants