On Wed Jul 24 16:08:05 2024 +0000, Elizabeth Figura wrote:
> Gitlab seems to claim that when it's actually not true, unfortunately. I
> don't know if there's anything we can do about it.
> I don't think merge requests need to be rebased unless there are
> actually merge conflicts.
I see, thanks for letting me know about that!
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/6133#note_76955
On Wed Jul 24 10:05:49 2024 +0000, Đorđe Mančić wrote:
> My bad, sorry. I'm new to contributing to Wine and the GitLab site said
> that the merge request can't be approved if I don't rebase, so that's
> why I did it.
Gitlab seems to claim that when it's actually not true, unfortunately. I don't know if there's anything we can do about it.
I don't think merge requests need to be rebased unless there are actually merge conflicts.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/6133#note_76952
On Wed Jul 24 10:05:49 2024 +0000, Fabian Maurer wrote:
> FWIW, I don't think you need to rebase it, unless there is conflicts.
My bad, sorry. I'm new to contributing to Wine and the GitLab site said that the merge request can't be approved if I don't rebase, so that's why I did it.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/6133#note_76935
Also some patches to address comments made on the last MR. :)
--
v2: d3dx9: Add support for loading non-square cubemap DDS files into cube textures.
d3dx9: Add support for specifying which array layer to get pixel data from to d3dx_image_get_pixels().
d3dx9: Use d3dx_image structure inside of D3DXCreateCubeTextureFromFileInMemoryEx().
d3dx9: Cleanup texture value argument handling in D3DXCreateCubeTextureFromFileInMemoryEx().
d3dx9: Refactor texture creation and cleanup in D3DXCreateCubeTextureFromFileInMemoryEx().
d3dx9/tests: Add more D3DXCreateCubeTextureFromFileInMemory{Ex}() tests.
d3dx9/tests: Reorder test structure members.
d3dx9/tests: Make some test structures static const.
https://gitlab.winehq.org/wine/wine/-/merge_requests/6040
Fixes bug 54861. The UK Kalender program was crashing when a new event was created as stated in the bug report. The fix is to create all the property sheet pages from the beginning instead of when they are selected.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/6146
Adding PSN_QUERYINITIALFOCUS helped fix some focus issues with the property sheet in bug 54862. Previously the listview in the tab control did not get focus from the start when it should have.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/6145