layer 6

diff --git a/Makefile b/Makefile
index 4fc11d6a57ff2cab45f1d556c6f795a93bdba07b..5791a6b3f834c287489cda449629c308ee76df8e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ SLIDES+= dm-2
 SLIDES+= dm-3
 SLIDES+= dm-4
 SLIDES+= dm-5
+SLIDES+= dm-6
 #SLIDES+= manpage
 
 SLIDEFILES=$(addsuffix .ps, $(SLIDES))

diff --git a/dm.fig b/dm.fig
index adee166c132f064e293baa21201983e31da16f2f..ee56a78a411a42d9b40a2c1406268e307147479a 100644 (file)
--- a/dm.fig
+++ b/dm.fig
@@ -40,11 +40,11 @@ Single
         -90 -2700 1260 -2700 1800 -4500
 2 1 1 2 0 7 12 -1 -1 6.000 0 0 7 0 0 2
         -90 -2700 -540 -2700
-2 2 0 2 0 7 52 -1 -1 0.000 0 0 7 0 0 5
+2 2 0 2 0 7 62 -1 -1 0.000 0 0 7 0 0 5
         7290 -7380 8100 -7380 8100 -7560 7290 -7560 7290 -7380
-2 3 0 2 0 7 52 -1 -1 0.000 0 0 7 0 0 6
+2 3 0 2 0 7 62 -1 -1 0.000 0 0 7 0 0 6
         7335 -7200 7425 -7065 8910 -7065 8910 -7335 7425 -7335 7335 -7200
-2 1 1 2 0 7 52 -1 -1 6.000 0 0 7 0 0 2
+2 1 1 2 0 7 62 -1 -1 6.000 0 0 7 0 0 2
         630 -7290 -585 -7290
 2 2 0 2 0 7 140 -1 -1 0.000 0 0 7 0 0 5
         6705 -5310 7515 -5310 7515 -5490 6705 -5490 6705 -5310
@@ -62,13 +62,13 @@ Single
 2 3 0 2 0 7 41 -1 20 0.000 0 0 0 0 0 7
         5580 -2475 5775 -2587 5775 -2813 5580 -2925 5385 -2812 5385 -2587
         5580 -2475
-2 3 0 2 0 7 51 -1 20 0.000 0 0 7 0 0 7
+2 3 0 2 0 7 61 -1 20 0.000 0 0 7 0 0 7
         6960 -7087 7155 -7199 7155 -7425 6960 -7537 6765 -7424 6765 -7199
         6960 -7087
-2 3 0 2 0 7 51 -1 20 0.000 0 0 7 0 0 7
+2 3 0 2 0 7 61 -1 20 0.000 0 0 7 0 0 7
         6735 -6300 6930 -6412 6930 -6638 6735 -6750 6540 -6637 6540 -6412
         6735 -6300
-2 1 0 2 0 7 52 -1 -1 0.000 0 0 7 0 0 3
+2 1 0 2 0 7 62 -1 -1 0.000 0 0 7 0 0 3
         630 -7290 6975 -7290 6390 -5400
 2 3 0 2 0 7 41 -1 20 0.000 0 0 0 0 0 7
         7485 -3578 7680 -3690 7680 -3916 7485 -4028 7290 -3915 7290 -3690
@@ -101,18 +101,18 @@ Single
 4 0 0 30 -1 14 20 0.0000 4 195 195 3195 -2610 C\001
 4 0 0 40 -1 14 20 0.0000 4 210 195 5490 -2610 d\001
 4 0 0 40 -1 16 20 0.0000 4 315 2895 1665 -810 Upstream git history\001
-4 0 0 52 -1 14 12 0.0000 4 120 720 7335 -7425 master\001
-4 0 0 52 -1 14 12 0.0000 4 150 1440 7425 -7155 debian/1.2-1\001
-4 0 0 50 -1 14 20 0.0000 4 255 195 6885 -7200 /\001
+4 0 0 62 -1 14 12 0.0000 4 120 720 7335 -7425 master\001
+4 0 0 62 -1 14 12 0.0000 4 150 1440 7425 -7155 debian/1.2-1\001
+4 0 0 60 -1 14 20 0.0000 4 255 195 6885 -7200 /\001
 4 0 0 140 -1 14 12 0.0000 4 120 720 6750 -5355 master\001
 4 0 0 130 -1 14 12 0.0000 4 120 720 4500 -5355 master\001
 4 0 0 120 -1 14 12 0.0000 4 120 720 2430 -5355 master\001
 4 0 0 110 -1 14 12 0.0000 4 120 720 2160 -4455 master\001
 4 0 0 20 -1 14 20 0.0000 4 210 390 1890 -5310 C3\001
 4 0 0 41 -1 16 20 0.0000 4 240 1035 4185 -3150 Anchor\001
-4 0 0 51 -1 12 12 0.0000 4 180 1080 5490 -6390 d/patches\001
-4 0 0 52 -1 0 12 0.0000 4 0 45 5130 -7335  \001
-4 0 0 52 -1 16 20 0.0000 4 315 2790 1215 -7425 Interchange branch\001
+4 0 0 61 -1 12 12 0.0000 4 180 1080 5490 -6390 d/patches\001
+4 0 0 62 -1 0 12 0.0000 4 0 45 5130 -7335  \001
+4 0 0 62 -1 16 20 0.0000 4 315 2790 1215 -7425 Interchange branch\001
 4 0 0 12 -1 0 15 1.0472 4 225 675 540 -3015 change\001
 4 0 0 12 -1 0 15 1.0472 4 225 990 315 -3015 packaging\001
 4 0 0 12 -1 0 15 0.0000 4 165 765 1845 -3420 commit\001
@@ -126,15 +126,15 @@ Single
 4 0 0 41 -1 0 15 0.0000 4 180 615 4770 -2970 merge\001
 4 0 0 32 -1 0 15 0.0000 4 225 990 2835 -2295 packaging\001
 4 0 0 32 -1 0 15 0.0000 4 225 660 2925 -2115 part of\001
-4 0 0 52 -1 0 15 0.0000 4 225 2325 1485 -7065 published, eg salsa, dgit\001
+4 0 0 62 -1 0 15 0.0000 4 225 2325 1485 -7065 published, eg salsa, dgit\001
 4 0 0 32 -1 14 12 0.0000 4 120 240 4815 -4320 C3\001
 4 0 0 32 -1 14 12 0.0000 4 120 240 3555 -2115 C3\001
-4 0 0 51 -1 0 15 0.0000 4 225 1170 5400 -6570 (re)generate\001
-4 0 0 51 -1 0 15 0.0000 4 225 1290 5490 -7110 pseudomerge\001
+4 0 0 61 -1 0 15 0.0000 4 225 1170 5400 -6570 (re)generate\001
+4 0 0 61 -1 0 15 0.0000 4 225 1290 5490 -7110 pseudomerge\001
 4 0 0 41 -1 0 15 0.0000 4 225 675 4095 -2970 special\001
 4 0 0 41 -1 0 15 0.0000 4 165 1125 5580 -2115 add version\001
 4 0 0 40 -1 14 20 0.0000 4 255 195 4590 -2610 @\001
-4 0 0 50 -1 14 20 0.0000 4 195 195 6643 -6423 %\001
+4 0 0 60 -1 14 20 0.0000 4 195 195 6643 -6423 %\001
 4 0 0 41 -1 0 15 0.0000 4 165 765 8055 -3600 commit\001
 4 0 0 41 -1 0 15 0.0000 4 225 1365 8055 -3825 autogenerated\001
 4 0 0 41 -1 0 15 0.0000 4 60 135 7830 -3735 =\001