projects / fw / altos / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 669cde8 57487e7)
Merge branch 'master' into micropeak-logging
authorKeith Packard <keithp@keithp.com>
Tue, 25 Dec 2012 22:20:42 +0000 (14:20 -0800)
committerKeith Packard <keithp@keithp.com>
Tue, 25 Dec 2012 22:20:42 +0000 (14:20 -0800)
1  2 
configure.ac patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
AltOS - the operating system for Altus Metrum products