Commit Graph

434 Commits

Author SHA1 Message Date
RichardG867
aa09135ace Merge branch 'v4.1' into v4.2 2025-06-29 23:09:27 -03:00
RichardG867
02afcba56f Merge branch 'v4.0' into v4.1 2025-06-29 23:09:20 -03:00
RichardG867
de3e53502b Merge branch 'v3.11' into v4.0 2025-06-29 23:09:13 -03:00
RichardG867
ecc02a37ef Merge branch 'v3.7' into v3.11
# Conflicts:
#	settings/network.rst
2025-06-29 23:09:07 -03:00
RichardG867
07f4b6c5af Merge branch 'v3.6' into v3.7 2025-06-29 23:07:42 -03:00
RichardG867
8f1d57e927 Merge branch 'v3.5' into v3.6 2025-06-29 23:07:38 -03:00
RichardG867
71ca79498f Merge branch 'v3.4' into v3.5 2025-06-29 23:07:33 -03:00
RichardG867
d2a1ea7bf8 Merge branch 'v3.3' into v3.4 2025-06-29 23:07:30 -03:00
RichardG867
2cf3b6dafb Merge branch 'v3.2' into v3.3 2025-06-29 23:07:27 -03:00
RichardG867
8b89e9c198 Merge branch 'v3.0' into v3.2 2025-06-29 23:07:19 -03:00
RichardG867
f79fc9aa55 Delegate missing pcap to the more detailed page 2025-06-29 23:07:01 -03:00
RichardG867
d2e775ddde Merge branch 'v4.1' into v4.2 2025-05-28 18:11:48 -03:00
RichardG867
33bdccc522 Merge branch 'v4.0' into v4.1 2025-05-28 18:11:19 -03:00
RichardG867
8a73b29303 Additional PCjr POST card ports 2025-05-28 18:11:14 -03:00
RichardG867
77a7920af6 Merge branch 'v4.1' into v4.2 2025-05-28 15:18:15 -03:00
RichardG867
90173093ed Merge branch 'v4.0' into v4.1 2025-05-28 15:18:09 -03:00
RichardG867
dde335bfe3 Olivetti POST card port 2025-05-28 15:18:06 -03:00
RichardG867
307630aa34 Merge branch 'v4.1' into v4.2
# Conflicts:
#	dev/formats/86f.rst
2025-04-16 17:42:41 -03:00
RichardG867
54f857a6bb Remove 4.0.1 CD-ROM notice 2025-04-16 17:42:10 -03:00
RichardG867
0c3cc5a313 Merge branch 'v4.0' into v4.1 2025-04-16 17:41:25 -03:00
RichardG867
65c48a501a Merge branch 'v3.11' into v4.0
# Conflicts:
#	settings/sound.rst
2025-04-16 17:40:50 -03:00
RichardG867
9264786d5f Clear a small merge incident 2025-04-16 17:39:40 -03:00
RichardG867
09bf51a859 Merge branch 'v3.7' into v3.11 2025-04-16 17:38:03 -03:00
RichardG867
8dc8945cba Merge branch 'v3.6' into v3.7
# Conflicts:
#	usage/menubar.rst
2025-04-16 17:37:49 -03:00
RichardG867
4da1f70238 Merge branch 'v3.5' into v3.6
# Conflicts:
#	usage/menubar.rst
2025-04-16 17:37:18 -03:00
RichardG867
5e972405b5 Merge branch 'v3.4' into v3.5
# Conflicts:
#	usage/menubar.rst
2025-04-16 17:35:25 -03:00
RichardG867
42dceca2ab Merge branch 'v3.3' into v3.4 2025-04-16 17:34:31 -03:00
RichardG867
a2e678d032 Remove Qt UI MT-32 notice 2025-04-16 17:34:06 -03:00
RichardG867
0342499179 Merge branch 'v3.2' into v3.3
# Conflicts:
#	usage/menubar.rst
2025-04-16 17:33:40 -03:00
RichardG867
19417933f3 Merge branch 'v3.0' into v3.2
# Conflicts:
#	usage/statusbar.rst
2025-04-16 17:31:30 -03:00
RichardG867
d6ff6959f7 Status bar priority stuff from later versions 2025-04-16 17:27:21 -03:00
RichardG867
0ed0e63c22 MT-32 display 2025-04-16 17:26:17 -03:00
RichardG867
e3788de64b Remove LBA Enhancer notice 2025-04-15 19:20:43 -03:00
RichardG867
954a2b9db5 Small media menu fix as we have host drives in the mix now too 2025-04-15 15:41:59 -03:00
RichardG867
72f521bb86 CD-ROM count increase 2025-04-15 15:08:43 -03:00
RichardG867
539f7d66c8 CD-ROM count increase 2025-04-15 15:08:35 -03:00
RichardG867
c5b7eead65 CD-ROM count increase 2025-04-15 15:08:07 -03:00
RichardG867
6cfae537d7 Media history for remaining removable drives 2025-04-14 22:58:52 -03:00
RichardG867
c91926976c Backport Sphinx 8 upgrade 2025-04-13 10:58:46 -03:00
RichardG867
0e5c18c50f Backport Sphinx 8 upgrade 2025-04-13 10:58:41 -03:00
RichardG867
2982956126 Backport Sphinx 8 upgrade 2025-04-13 10:58:35 -03:00
RichardG867
62b1392501 Backport Sphinx 8 upgrade 2025-04-13 10:58:29 -03:00
RichardG867
095902a77b Backport Sphinx 8 upgrade 2025-04-13 10:58:22 -03:00
RichardG867
fe7ba0d904 Backport Sphinx 8 upgrade 2025-04-13 10:58:16 -03:00
RichardG867
8b43192090 Backport Sphinx 8 upgrade 2025-04-13 10:58:11 -03:00
RichardG867
9505fa594c Backport Sphinx 8 upgrade 2025-04-13 10:58:06 -03:00
RichardG867
2229e2c1af Backport Sphinx 8 upgrade 2025-04-13 10:58:01 -03:00
RichardG867
4c274bf716 Backport Sphinx 8 upgrade 2025-04-13 10:57:56 -03:00
RichardG867
ee0ff496e2 Backport Sphinx 8 upgrade 2025-04-13 10:57:47 -03:00
RichardG867
8a2580eb85 Backport environment updates from v4.3 2025-04-13 10:01:37 -03:00