Skip to content

Commit 234d366

Browse files
committed
Sync with 'master'
2 parents f7e984a + ab776a6 commit 234d366

2 files changed

Lines changed: 10 additions & 1 deletion

File tree

Documentation/RelNotes/2.55.0.adoc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,15 @@ Performance, Internal Implementation, Development Support etc.
221221
checks, and the existing GIT_GNUC_PREREQ macro has been modernized
222222
to use explicit major/minor comparisons rather than bit-shifting.
223223
224+
* Wean the Windows builds in GitLab CI procedure away from
225+
(unfortunately unreliable) Chocolatey to install dependencies.
226+
(merge 0e7b51fed2 ps/gitlab-ci-windows later to maint).
227+
228+
* Build-fix for 32-bit Windows.
229+
230+
* Xcode 15 and later has a linker set to complain when the same library
231+
archive is listed twice on the command line. Squelch the annoyance.
232+
224233
225234
Fixes since v2.54
226235
-----------------

GIT-VERSION-GEN

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
DEF_VER=v2.55.0-rc1
3+
DEF_VER=v2.55.0-rc2
44

55
LF='
66
'

0 commit comments

Comments
 (0)