Skip to content

Add metal feature and makefile targets for paddler_gui#237

Merged
mcharytoniuk merged 2 commits into
mainfrom
paddler-gui-metal-feature
May 22, 2026
Merged

Add metal feature and makefile targets for paddler_gui#237
mcharytoniuk merged 2 commits into
mainfrom
paddler-gui-metal-feature

Conversation

@malzag
Copy link
Copy Markdown
Collaborator

@malzag malzag commented May 19, 2026

No description provided.

@mcharytoniuk
Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

…ture

# Conflicts:
#	Makefile

Co-authored-by: mcharytoniuk <1286785+mcharytoniuk@users.noreply.github.com>
Copy link
Copy Markdown
Contributor

Copilot AI commented May 21, 2026

@copilot resolve the merge conflicts in this pull request

Resolved the merge conflicts by merging origin/main into this PR branch and fixing the Makefile conflict to keep both paddler_gui release targets (cuda and metal). Addressed in commit 891d853.

Copilot AI requested a review from mcharytoniuk May 21, 2026 18:07
@mcharytoniuk mcharytoniuk merged commit 8f845cc into main May 22, 2026
12 checks passed
@mcharytoniuk mcharytoniuk deleted the paddler-gui-metal-feature branch May 22, 2026 13:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants