Merge the already-merged parts of the 0.74 branch.

Browse Source

This is a no-op merge, via 'git merge -s ours', which records that all
the commits up to this point on the 0.74 branch are bug fixes
cherry-picked from master, and don't need merging back to master.

From this point onwards, the 0.74 branch will contain fresh work that
_will_ need merging back to master. This preliminary non-merge allows
me to avoid needless conflicts during that process.

...

This commit is contained in:

Simon Tatham 2020-06-27 08:04:58 +01:00

parent 2bbed67d9e 371c7d12f5

commit ba6b47807c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available