if wayland's gonna be disabled by default until it's finished then i'm just gonna develop it on master so that we don't have to worry about merge conflicts during any long periods where i don't feel like working on it #2

Merged

IoI_xD merged 8 commits from wayland-p2 into master 2025-12-18 11:13:59 +09:00

Conversation 0 Commits 8 Files changed 8 +243 -405

IoI_xD commented 2025-12-18 11:06:02 +09:00

Owner

Copy link

No description provided.

IoI_xD added 6 commits 2025-12-18 11:06:03 +09:00

remove egl stuff from wayland to make way for a software renderer lmao f68b9a9aae

remove egl dependency 4951e8995e

some stuffs work 7a81af9922

now ACTUALLY format bee6cb81ca

pixmap works 7f43a974cd

format 7f823e2d34

IoI_xD added 1 commit 2025-12-18 11:08:17 +09:00

merge conflict c6c2028646

IoI_xD added 1 commit 2025-12-18 11:09:05 +09:00

Merge branch 'master' into wayland-p2 5e6a25d1b8

IoI_xD force-pushed wayland-p2 from 5e6a25d1b8 to d117241ba7 2025-12-18 11:11:27 +09:00 Compare

IoI_xD added 8 commits 2025-12-18 11:13:06 +09:00

remove egl stuff from wayland to make way for a software renderer lmao f68b9a9aae

remove egl dependency 4951e8995e

some stuffs work 7a81af9922

now ACTUALLY format bee6cb81ca

pixmap works 7f43a974cd

format 7f823e2d34

merge conflict c6c2028646

Merge commit 'c6c202864' into wayland-p2 bd47bdab41

IoI_xD merged commit 71632d34fe into master 2025-12-18 11:13:59 +09:00

IoI_xD referenced this pull request from a commit 2025-12-18 11:14:01 +09:00

if wayland's gonna be disabled by default until it's finished then i'm just gonna develop it on master so that we don't have to worry about merge conflicts during any long periods where i don't feel like working on it (#2)

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

pyrite-dev/milsko!2

No description provided.