diff options
| author | Bdale Garbee <bdale@gag.com> | 2013-12-19 01:38:40 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2013-12-19 01:38:40 -0700 |
| commit | 575bbaf976c5840fd0e308549c45a466fdec1352 (patch) | |
| tree | 11bfb498348bf7687bffc24699c4b1a998988ee4 /libaltos/libaltos.dylib | |
| parent | b825116df173b77e2cab217a7b76112c742f9279 (diff) | |
| parent | bc3610d8cecbfed40c62d4dcb93fc9a4d2a7c9e3 (diff) | |
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
Diffstat (limited to 'libaltos/libaltos.dylib')
| -rwxr-xr-x | libaltos/libaltos.dylib | bin | 41596 -> 41596 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/libaltos/libaltos.dylib b/libaltos/libaltos.dylib Binary files differindex cfbd3f54..8b491c58 100755 --- a/libaltos/libaltos.dylib +++ b/libaltos/libaltos.dylib |