Merge remote-tracking branch 'upstream/master'

Fix merge conflicts as follows:

* Unpack new zip archive into new destination.

* Replace old combined schematic with new combined schematic, rename to
  remove colons from file name.

* Add updated individual pages schematics.

hardware/pcb/mlb/GLUE+RAM SIMMs.sch

@@ -1952,7 +1952,7 @@ SCCWR*
 Text GLabel 5700 4650 2    50   Input ~ 0
 SCSIDACK*
 Text GLabel 5700 4750 2    50   Input ~ 0
-IDR*
+IOR*
 Text GLabel 5700 4950 2    50   Input ~ 0
 IOW*
 Text GLabel 5700 5050 2    50   Input ~ 0

hardware/pcb/mlb/Macintosh SE30 Main Logic Board.pro

@@ -1,4 +1,4 @@
-update=Monday, May 25, 2020 at 12:53:54 PM
+update=Sunday, August 02, 2020 at 12:31:35 PM
 version=1
 last_client=kicad
 [general]

hardware/pcb/mlb/SE30 Components Library/Macintosh_SE_30_Components.lib

@@ -122,6 +122,7 @@ S -400 1000 400 -2100 0 1 0 f
 X /DB7 1 600 50 197 L 50 50 1 1 I
 X /EDP 10 -600 -1350 197 R 50 50 1 1 I
 X /DACK 11 -600 -1650 197 R 50 50 1 1 I
+X ~ 12 50 -2300 197 U 50 50 1 1 I
 X READY 13 -600 -1450 197 R 50 50 1 1 I
 X A0 14 -600 -350 197 R 50 50 1 1 I
 X A1 15 -600 -250 197 R 50 50 1 1 I
@@ -133,6 +134,7 @@ X /RST 2 600 -1150 197 L 50 50 1 1 I
 X D7 20 -600 750 197 R 50 50 1 1 I
 X D6 21 -600 650 197 R 50 50 1 1 I
 X D5 22 -600 550 197 R 50 50 1 1 I
+X ~ 23 0 1200 197 D 50 50 1 1 I
 X D4 24 -600 450 197 R 50 50 1 1 I
 X D3 25 -600 350 197 R 50 50 1 1 I
 X D2 26 -600 250 197 R 50 50 1 1 I
@@ -141,16 +143,19 @@ X D0 28 -600 50 197 R 50 50 1 1 I
 X /MSG 29 600 -1250 197 L 50 50 1 1 I
 X G1 3 -600 -1750 197 R 50 50 1 1 I
 X C/D 30 600 -1450 197 L 50 50 1 1 I
+X ~ 31 200 -2300 197 U 50 50 1 1 I
 X I/O 32 600 -1650 197 L 50 50 1 1 I
 X /ACK 33 600 -1050 197 L 50 50 1 1 I
 X /REQ 34 600 -1550 197 L 50 50 1 1 I
 X /DBP 35 600 -50 197 L 50 50 1 1 I
+X ~ 36 -100 -2300 197 U 50 50 1 1 I
 X /DB0 37 600 750 197 L 50 50 1 1 I
 X /DB1 38 600 650 197 L 50 50 1 1 I
 X /DB2 39 600 550 197 L 50 50 1 1 I
 X /BSY 4 600 -950 197 L 50 50 1 1 I
 X /DB3 40 600 450 197 L 50 50 1 1 I
 X /DB4 41 600 350 197 L 50 50 1 1 I
+X ~ 42 -250 -2300 197 U 50 50 1 1 I
 X /DB5 43 600 250 197 L 50 50 1 1 I
 X /DB6 44 600 150 197 L 50 50 1 1 I
 X /SEL 5 600 -1350 197 L 50 50 1 1 I
@@ -158,11 +163,6 @@ X /ATN 6 600 -750 197 L 50 50 1 1 I
 X /RESET 7 -600 -950 197 R 50 50 1 1 I
 X IRQ 8 -600 -1150 197 R 50 50 1 1 I
 X DRQ 9 -600 -1550 197 R 50 50 1 1 I
-X ~ ~ -250 -2300 197 U 50 50 1 1 I
-X ~ ~ -100 -2300 197 U 50 50 1 1 I
-X ~ ~ 0 1200 197 D 50 50 1 1 I
-X ~ ~ 50 -2300 197 U 50 50 1 1 I
-X ~ ~ 200 -2300 197 U 50 50 1 1 I
 ENDDRAW
 ENDDEF
 #
@@ -821,7 +821,6 @@ X PWRIRQN 10 -500 -1050 197 R 50 50 1 1 I I
 X SCCIRQN 11 -500 -1150 197 R 50 50 1 1 I I
 X VIAIRQ2N 12 -500 -1250 197 R 50 50 1 1 I I
 X IPL2N 13 -500 -1350 197 R 50 50 1 1 I I
-X SCSIN 14 -500 -2450 197 R 50 50 1 1 I
 X VIAIRQ1 14 -500 -1450 197 R 50 50 1 1 I I
 X IPL1N 15 -500 -1550 197 R 50 50 1 1 I I
 X IPL0N 16 -500 -1650 197 R 50 50 1 1 I I
@@ -833,6 +832,7 @@ X SYNC 20 -500 -2050 197 R 50 50 1 1 I
 X C3M 21 -500 -2150 197 R 50 50 1 1 I
 X SYNC3M 22 -500 -2250 197 R 50 50 1 1 I
 X FC2 23 -500 -2350 197 R 50 50 1 1 I
+X SCSIN 24 -500 -2450 197 R 50 50 1 1 I
 X IWMN 25 -500 -2550 197 R 50 50 1 1 I
 X FC1 26 -500 -2650 197 R 50 50 1 1 I
 X ROMN 27 -500 -2750 197 R 50 50 1 1 I

hardware/pcb/mlb/SWIM+SCSI Interface.sch

@@ -3216,6 +3216,13 @@ Wire Wire Line
 	3550 4900 3450 4900
 Wire Wire Line
 	3250 8000 3350 8000
+Connection ~ 3550 8000
+Connection ~ 3350 8000
+Wire Wire Line
+	3350 8000 3450 8000
+Connection ~ 3450 8000
+Wire Wire Line
+	3450 8000 3550 8000
 Wire Bus Line
 	6700 2700 6700 2900
 Wire Bus Line
@@ -3224,11 +3231,4 @@ Wire Bus Line
 	6700 2000 6700 2500
 Wire Bus Line
 	1800 2500 1800 6800
-Connection ~ 3550 8000
-Connection ~ 3350 8000
-Wire Wire Line
-	3350 8000 3450 8000
-Connection ~ 3450 8000
-Wire Wire Line
-	3450 8000 3550 8000
 $EndSCHEMATC