Merge branch 'branch-1.3' into debian
authorBdale Garbee <bdale@gag.com>
Thu, 19 Dec 2013 08:38:40 +0000 (01:38 -0700)
committerBdale Garbee <bdale@gag.com>
Thu, 19 Dec 2013 08:38:40 +0000 (01:38 -0700)
commit575bbaf976c5840fd0e308549c45a466fdec1352
tree11bfb498348bf7687bffc24699c4b1a998988ee4
parentb825116df173b77e2cab217a7b76112c742f9279
parentbc3610d8cecbfed40c62d4dcb93fc9a4d2a7c9e3
Merge branch 'branch-1.3' into debian

Conflicts:
ChangeLog
altoslib/AltosRecordMM.java
altosui/Makefile.am
altosui/altos-windows.nsi.in
configure.ac
debian/changelog
debian/control
doc/Makefile
doc/altusmetrum.xsl
doc/release-notes-1.2.1.xsl
doc/release-notes-1.2.xsl
ChangeLog
configure.ac
debian/rules
src/test/Makefile