diff options
| author | Bdale Garbee <bdale@gag.com> | 2013-12-19 01:38:40 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2013-12-19 01:38:40 -0700 |
| commit | 575bbaf976c5840fd0e308549c45a466fdec1352 (patch) | |
| tree | 11bfb498348bf7687bffc24699c4b1a998988ee4 /altosdroid/Notebook | |
| parent | b825116df173b77e2cab217a7b76112c742f9279 (diff) | |
| parent | bc3610d8cecbfed40c62d4dcb93fc9a4d2a7c9e3 (diff) | |
Merge branch 'branch-1.3' into debian
Conflicts:
ChangeLog
altoslib/AltosRecordMM.java
altosui/Makefile.am
altosui/altos-windows.nsi.in
configure.ac
debian/changelog
debian/control
doc/Makefile
doc/altusmetrum.xsl
doc/release-notes-1.2.1.xsl
doc/release-notes-1.2.xsl
Diffstat (limited to 'altosdroid/Notebook')
| -rw-r--r-- | altosdroid/Notebook | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/altosdroid/Notebook b/altosdroid/Notebook index b4ae2b7f..ebb3578d 100644 --- a/altosdroid/Notebook +++ b/altosdroid/Notebook @@ -28,3 +28,5 @@ Desired AltosDroid feature list 'find my rocket' mode after shutting down the application. *) Imperial Units mode + + *) TeleBT battery voltage |