CVS log for ais/conflict.txt

to ais/
Request differences between arbitrary revisions
Note: The reading versions are automatically formatted from the original source files, which contain no formatting. As such, they reflect a program's guess about the meaning of the contents of the source file, which cannot be accurate in all circumstances. The purpose of these versions is to make the files easier to read in normal circumstances; the formatting was created as a service to the Ada community by volunteers. If the format of the reading contains unacceptable errors, please refer to the regular unformatted version. As we cannot change the contents of the original source files, and it is impractical to build a formatter that can properly format largely unstructured text in all circumstances, please do not send comments on the quality of the formatting, use the regular raw version instead. The reading versions will be removed entirely if this guidance is not followed.

1.9
Reading version of 1.9
Modified 2000/10/05 02:47:31 by Randy with line changes +2 -2
CVS Tags: HEAD, AI070120, AI060306, AI051215, AI050615, AI050415, AI041115, AI040915, AI040301, AI040125, AI030925, AI030620, AI-030201, AI021030, AI020210, AI011001, AI010601, AI001001
Differences from 1.8
Added various E-Mail.

1.8
Reading version of 1.8
Modified 2000/08/01 05:39:35 by Randy with line changes +3 -3
CVS Tags: AI000815
Differences from 1.7
Various changes for the final versions of the Corrigendum and related documents.

1.7
Reading version of 1.7
Modified 2000/07/15 02:30:02 by Randy with line changes +5 -3
Differences from 1.6
Updated with remaining changes from meeting, and other corrections for documents.

1.6
Reading version of 1.6
Modified 2000/06/22 23:29:24 by Randy with line changes +7 -7
CVS Tags: AI000625
Differences from 1.5
Fixed glitches noticed by BSI in the documents.

1.5
Reading version of 1.5
Modified 2000/04/20 20:20:13 by Randy with line changes +2 -2
Differences from 1.4
Various corrections in the minutes and not in my notes; added some E-Mail.

1.4
Reading version of 1.4
Modified 2000/04/14 01:45:09 by Randy with line changes +36 -49
Differences from 1.3
Updated with E-Mail and meeting changes, and some spelling and grammar changes.

1.3
Reading version of 1.3
Modified 1999/10/08 23:41:06 by Randy with line changes +79 -16
CVS Tags: AI000320
Differences from 1.2
Updated with many comments from ARG meeting.

1.2
Reading version of 1.2
Modified 1999/09/16 20:40:30 by Randy with line changes +6 -6
CVS Tags: AI990915
Differences from 1.1
Repaired various typos in the corrigendum.

1.1
Reading version of 1.1
Modified 1999/08/20 03:59:44 by Randy
Improved formatting; created conflict resolution file.

This form allows you to request differences between any two revisions of a file, by number or by tag.

Differences between

Questions? Ask the ACAA Technical Agent