diff options
| author | Keith Packard <keithp@keithp.com> | 2011-10-07 08:34:59 -0600 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-10-07 08:34:59 -0600 |
| commit | 1c344b760776cd5d8c0297d8db9bf02687381b4e (patch) | |
| tree | fb0e111268f64cce5ae96ebe0d618768eb6edf31 /doc | |
| parent | 4ed53ef838afd4e922deb1c721a311974527525a (diff) | |
| parent | fc4173ff882dd9718f34ed043276ef612783dfe0 (diff) | |
Merge remote-tracking branch 'origin/master' into multiarch
Conflicts:
configure.ac
Fix version number and location of ao.h header
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile | 2 | ||||
| -rw-r--r-- | doc/altusmetrum.xsl | 2 | ||||
| -rw-r--r-- | doc/release-notes-1.0.1.xsl (renamed from doc/release-notes-1.0.xsl) | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/Makefile b/doc/Makefile index 35858b15..14bce5c9 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -7,7 +7,7 @@ RELNOTES=\ release-notes-0.8.html \ release-notes-0.9.html \ release-notes-0.9.2.html \ - release-notes-1.0.html + release-notes-1.0.1.html RELNOTES_XSL=$(RELNOTES:.html=.xsl) HTML=altusmetrum.html altos.html telemetry.html $(RELNOTES) diff --git a/doc/altusmetrum.xsl b/doc/altusmetrum.xsl index 5a60da7a..606c8b99 100644 --- a/doc/altusmetrum.xsl +++ b/doc/altusmetrum.xsl @@ -2480,7 +2480,7 @@ NAR #88757, TRA #12200 <appendix xmlns:xi="http://www.w3.org/2001/XInclude"> <title>Release Notes</title> - <xi:include href="release-notes-1.0.xsl" xpointer="xpointer(/article/*)"/> + <xi:include href="release-notes-1.0.1.xsl" xpointer="xpointer(/article/*)"/> <xi:include href="release-notes-0.9.2.xsl" xpointer="xpointer(/article/*)"/> <xi:include href="release-notes-0.9.xsl" xpointer="xpointer(/article/*)"/> <xi:include href="release-notes-0.8.xsl" xpointer="xpointer(/article/*)"/> diff --git a/doc/release-notes-1.0.xsl b/doc/release-notes-1.0.1.xsl index 1a06a43d..1e9fcabc 100644 --- a/doc/release-notes-1.0.xsl +++ b/doc/release-notes-1.0.1.xsl @@ -4,7 +4,7 @@ <article> <para> - Version 1.0 is a major release, adding support for the TeleMini + Version 1.0.1 is a major release, adding support for the TeleMini device and lots of new AltosUI features </para> <para> |