projects / fw / altos / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 6a1e398 f6661cc)
Merge remote-tracking branch 'origin/master'
authorKeith Packard <keithp@keithp.com>
Tue, 8 Oct 2013 16:26:41 +0000 (09:26 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 8 Oct 2013 16:26:41 +0000 (09:26 -0700)
Signed-off-by: Keith Packard <keithp@keithp.com>
Conflicts:
configure.ac


Trivial merge
AltOS - the operating system for Altus Metrum products