projects / fw / altos / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5a2f6ed 28bd505)
Merge branch 'branch-1.5' into debian
authorBdale Garbee <bdale@gag.com>
Wed, 10 Sep 2014 05:28:39 +0000 (23:28 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 10 Sep 2014 05:28:39 +0000 (23:28 -0600)
Conflicts:
ChangeLog
Releasing
altosui/Instdrv/NSIS/Includes/java.nsh
altosui/altos-windows.nsi.in
configure.ac
doc/Makefile
doc/altusmetrum.xsl
micropeak/micropeak-windows.nsi.in
telegps/telegps-windows.nsi.in


Trivial merge
AltOS - the operating system for Altus Metrum products