Merge remote-tracking branch 'mjb/master'
authorKeith Packard <keithp@keithp.com>
Sun, 10 Feb 2013 09:21:52 +0000 (01:21 -0800)
committerKeith Packard <keithp@keithp.com>
Sun, 10 Feb 2013 09:21:52 +0000 (01:21 -0800)
commitbf88c5f829ea5d32043431945e862a9f6c96740a
tree6ab88a057b3f69f16b8d048ae132bcbe31812dfe
parent32270296671aac3b3ba15f9c1777bcdd77b9c36c
parentd05a77992df983b9fa79f0e2b20d2c6b387c180c
Merge remote-tracking branch 'mjb/master'
altosdroid/Makefile.am
altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java