projects / fw / altos / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db51224 e2cefd8)
Merge branch 'branch-1.6' into debian
authorBdale Garbee <bdale@gag.com>
Sun, 8 Feb 2015 05:39:54 +0000 (22:39 -0700)
committerBdale Garbee <bdale@gag.com>
Sun, 8 Feb 2015 05:39:54 +0000 (22:39 -0700)
Conflicts:
ChangeLog
altoslib/AltosTelemetryReader.java
configure.ac


Trivial merge
AltOS - the operating system for Altus Metrum products