diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-09-09 23:28:39 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-09-09 23:28:39 -0600 |
| commit | 16405fd3eb6f82ef3a709e3ed30fc48faef7b547 (patch) | |
| tree | c111819b3ba0c9357af41c81b798326b9df7adad /doc/Makefile | |
| parent | 5a2f6ed6210844f7284fbf9f7ecba68c8a14fa52 (diff) | |
| parent | 28bd5057252e61bc5b1a35a00bc1f9fdfde097f7 (diff) | |
Merge branch 'branch-1.5' into debian
Conflicts:
ChangeLog
Releasing
altosui/Instdrv/NSIS/Includes/java.nsh
altosui/altos-windows.nsi.in
configure.ac
doc/Makefile
doc/altusmetrum.xsl
micropeak/micropeak-windows.nsi.in
telegps/telegps-windows.nsi.in
Diffstat (limited to 'doc/Makefile')
| -rw-r--r-- | doc/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/doc/Makefile b/doc/Makefile index c39450c7..60c63f63 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -16,7 +16,8 @@ RELNOTES=\ release-notes-1.3.1.html \ release-notes-1.3.2.html \ release-notes-1.4.html \ - release-notes-1.4.1.html + release-notes-1.4.1.html \ + release-notes-1.5.html PICTURES=\ altosui.png \ @@ -61,12 +62,13 @@ SVG=\ easymini.svg \ telemega.svg \ telemetrum.svg \ - telemini.svg + telemini.svg \ + easymega.svg RELNOTES_XSL=$(RELNOTES:.html=.xsl) HTML=altusmetrum.html altos.html telemetry.html companion.html micropeak.html telegps.html $(RELNOTES) PDF=altusmetrum.pdf altos.pdf telemetry.pdf companion.pdf micropeak.pdf telegps.pdf \ - telemetrum-outline.pdf telemega-outline.pdf easymini-outline.pdf + telemetrum-outline.pdf telemega-outline.pdf easymini-outline.pdf easymega-outline.pdf HTMLSTYLE=/usr/share/xml/docbook/stylesheet/docbook-xsl/html/docbook.xsl FOSTYLE=xorg-fo.xsl TEMPLATES=titlepage.templates.xsl |