From: Ian Jackson Date: Sun, 29 Jul 2018 09:12:49 +0000 (+0100) Subject: fix missing <1.2| tag annotation X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=85a6b8c6d8a08dc6e2d4ec4085892a37caea275b;p=talk-2018-dc18-gdr.git fix missing <1.2| tag annotation Signed-off-by: Ian Jackson --- diff --git a/dm.fig b/dm.fig index d88ca6b..2182cfa 100644 --- a/dm.fig +++ b/dm.fig @@ -21,11 +21,6 @@ Single 2 2 0 2 0 7 2 -1 20 0.000 0 0 -1 0 0 5 3195 -6885 8550 -6885 8550 -5175 3195 -5175 3195 -6885 -6 -6 4620 -1725 5280 -1425 -2 3 0 2 0 7 44 -1 -1 0.000 0 0 7 0 0 6 - 4635 -1575 4725 -1440 5265 -1440 5265 -1710 4725 -1710 4635 -1575 -4 0 0 44 -1 14 12 0.0000 4 120 480 4725 -1530 v1.2\001 --6 6 -960 -6810 5910 -4980 2 2 0 2 0 7 10 -1 -1 0.000 0 0 7 0 0 5 -900 -6750 5850 -6750 5850 -5040 -900 -5040 -900 -6750 @@ -37,6 +32,11 @@ Single 4 0 0 10 -1 2 20 0.0000 4 300 1020 -720 -5220 e.g., by\001 4 0 0 10 -1 14 20 0.0000 4 270 3315 630 -5220 git merge -s ours\001 -6 +6 4620 -1725 5280 -1425 +2 3 0 2 0 7 144 -1 -1 0.000 0 0 7 0 0 6 + 4635 -1575 4725 -1440 5265 -1440 5265 -1710 4725 -1710 4635 -1575 +4 0 0 144 -1 14 12 0.0000 4 120 480 4725 -1530 v1.2\001 +-6 1 3 0 2 0 7 151 -1 20 0.000 1 0.0000 6390 -5400 225 225 6390 -5400 6615 -5400 1 3 0 2 0 7 131 -1 20 0.000 1 0.0000 3870 -4500 225 225 3870 -4500 4095 -4500 1 3 0 2 0 7 131 -1 20 0.000 1 0.0000 4140 -5400 225 225 4140 -5400 4365 -5400 @@ -114,7 +114,7 @@ Single -675 -7020 1080 -7020 1080 -7200 -675 -7200 -675 -7020 2 2 0 2 7 7 999 -1 -1 0.000 0 0 -1 0 0 5 -1080 -450 10170 -450 10170 -8235 -1080 -8235 -1080 -450 -2 5 0 1 0 -1 24 -1 -1 0.000 0 0 -1 0 0 5 +2 5 0 1 0 -1 24 -1 20 0.000 0 0 -1 0 0 5 0 helm-rebase-crop.ppm 3124 -4830 9990 -4830 9990 -1080 3124 -1080 3124 -4830 3 2 0 2 0 7 144 -1 -1 0.000 0 0 0 3