projects / fw / altos / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ed53ef fc4173f)
Merge remote-tracking branch 'origin/master' into multiarch
authorKeith Packard <keithp@keithp.com>
Fri, 7 Oct 2011 14:34:59 +0000 (08:34 -0600)
committerKeith Packard <keithp@keithp.com>
Fri, 7 Oct 2011 14:34:59 +0000 (08:34 -0600)
Conflicts:
configure.ac

Fix version number and location of ao.h header


Trivial merge
AltOS - the operating system for Altus Metrum products