projects / fw / altos / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf05119 2752896)
Merge branch 'branch-1.3' into debian
authorBdale Garbee <bdale@gag.com>
Thu, 19 Dec 2013 09:04:43 +0000 (02:04 -0700)
committerBdale Garbee <bdale@gag.com>
Thu, 19 Dec 2013 09:04:43 +0000 (02:04 -0700)
Conflicts:
src/test/Makefile


Trivial merge
AltOS - the operating system for Altus Metrum products