diff options
| author | Bdale Garbee <bdale@gag.com> | 2015-02-07 22:39:54 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2015-02-07 22:39:54 -0700 |
| commit | f766a457323268857b3f2dfc7f42427437b71cb7 (patch) | |
| tree | 8afc8a661d682fc34b16fc0b1b44f2844d34f336 /doc/telegps.xsl | |
| parent | db51224af01731e7323f6f696a7397d64eb80b92 (diff) | |
| parent | e2cefd8593d269ce603aaf33f4a53a5c2dcb3350 (diff) | |
Merge branch 'branch-1.6' into debian
Conflicts:
ChangeLog
altoslib/AltosTelemetryReader.java
configure.ac
Diffstat (limited to 'doc/telegps.xsl')
| -rw-r--r-- | doc/telegps.xsl | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/doc/telegps.xsl b/doc/telegps.xsl index bf7eec5a..8de5c56d 100644 --- a/doc/telegps.xsl +++ b/doc/telegps.xsl @@ -10,7 +10,7 @@ <surname>Packard</surname> </author> <copyright> - <year>2014</year> + <year>2015</year> <holder>Bdale Garbee and Keith Packard</holder> </copyright> <mediaobject> @@ -29,6 +29,13 @@ </legalnotice> <revhistory> <revision> + <revnumber>1.6</revnumber> + <date>8 January 2015</date> + <revremark> + Major release adding TeleDongle v3.0 support. + </revremark> + </revision> + <revision> <revnumber>1.4.1</revnumber> <date>20 June 2014</date> <revremark> @@ -1305,7 +1312,14 @@ NAR #88757, TRA #12200 <appendix> <title>Release Notes</title> <simplesect> - <title>Version 1.41</title> + <title>Version 1.6</title> + <xi:include + xmlns:xi="http://www.w3.org/2001/XInclude" + href="release-notes-1.6.xsl" + xpointer="xpointer(/article/*)"/> + </simplesect> + <simplesect> + <title>Version 1.4.1</title> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="release-notes-1.4.1.xsl" |