projects / fw / altos / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f2f6a8 ae5eff7)
Merge branch 'bdale'
authorBdale Garbee <bdale@gag.com>
Fri, 27 Aug 2010 18:38:25 +0000 (12:38 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 27 Aug 2010 18:38:25 +0000 (12:38 -0600)
Conflicts:
debian/control


Trivial merge
AltOS - the operating system for Altus Metrum products