projects / fw / altos / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aea10c1 17b6ffb)
Merge remote-tracking branch 'mjb/master'
authorKeith Packard <keithp@keithp.com>
Wed, 29 Aug 2012 18:29:24 +0000 (11:29 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 29 Aug 2012 18:29:24 +0000 (11:29 -0700)
Pull in Mike's fancy new AltosDroid bits


Trivial merge
AltOS - the operating system for Altus Metrum products