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/Makefile | |
| parent | db51224af01731e7323f6f696a7397d64eb80b92 (diff) | |
| parent | e2cefd8593d269ce603aaf33f4a53a5c2dcb3350 (diff) | |
Merge branch 'branch-1.6' into debian
Conflicts:
ChangeLog
altoslib/AltosTelemetryReader.java
configure.ac
Diffstat (limited to 'doc/Makefile')
| -rw-r--r-- | doc/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/Makefile b/doc/Makefile index 60c63f63..2887a229 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -17,7 +17,8 @@ RELNOTES=\ release-notes-1.3.2.html \ release-notes-1.4.html \ release-notes-1.4.1.html \ - release-notes-1.5.html + release-notes-1.5.html \ + release-notes-1.6.html PICTURES=\ altosui.png \ |