projects / fw / altos / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d0098e 3fbefb3)
Merge branch 'buttonbox' into telemetrum-v1.1 telemetrum-v1.1
authorKeith Packard <keithp@keithp.com>
Wed, 24 Nov 2010 23:10:36 +0000 (15:10 -0800)
committerKeith Packard <keithp@keithp.com>
Wed, 24 Nov 2010 23:10:36 +0000 (15:10 -0800)

Trivial merge
AltOS - the operating system for Altus Metrum products