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)
commit16405fd3eb6f82ef3a709e3ed30fc48faef7b547
treec111819b3ba0c9357af41c81b798326b9df7adad
parent5a2f6ed6210844f7284fbf9f7ecba68c8a14fa52
parent28bd5057252e61bc5b1a35a00bc1f9fdfde097f7
Merge branch 'branch-1.5' into debian

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