mjb/altos - AltOS - the operating system for Altus Metrum products

	Commit message (Collapse)	Author	Age
*	fix missed merge conflict	Bdale Garbee	2013-12-19
\|
*	Merge branch 'branch-1.3' into debian	Bdale Garbee	2013-12-19
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	update ChangeLog from git	Bdale Garbee	2013-12-19
\| \|
* \|	update Changelog for 1.2.1 release, again1.2.1	Bdale Garbee	2013-05-21
\| \|
* \|	update changelog for 1.2.1 release	Bdale Garbee	2013-05-21
\| \|
* \|	update ChangeLog for release	Bdale Garbee	2013-05-16
\|/
*	releasing 1.1.11.1.1	Bdale Garbee	2012-09-16
\|
*	releasing 1.1	Bdale Garbee	2012-09-11
\|
*	update changelogs for Debian build	Bdale Garbee	2011-08-28
\|
*	update changelogs for Debian builddebian/1.0.1	Bdale Garbee	2011-08-26
\|
*	update changelogs for Debian build	Bdale Garbee	2011-08-26
\|
*	update changelogs for Debian builddebian/1.0	Bdale Garbee	2011-08-25
\|
*	update changelogs for Debian build	Bdale Garbee	2011-08-24
\|
*	update changelogs for Debian build	Bdale Garbee	2011-08-24
\|
*	update changelogs for Debian build	Bdale Garbee	2011-08-23
\|
*	update changelogs for Debian build	Bdale Garbee	2011-08-23
\|
*	update changelogs for Debian build	Bdale Garbee	2011-08-20
\|
*	update changelogs for Debian build	Bdale Garbee	2011-08-20
\|
*	update changelogs for Debian builddebian/0.9.6.0	Bdale Garbee	2011-08-19
\|
*	update changelogs for Debian build	Bdale Garbee	2011-08-08
\|
*	update changelogs for Debian build	Bdale Garbee	2011-08-08
\|
*	update changelogs for Debian build	Bdale Garbee	2011-08-08
\|
*	update changelogs for Debian builddebian/0.9.1	Bdale Garbee	2011-02-18
\|
*	update changelogs for Debian builddebian/0.9	Bdale Garbee	2011-01-19
\|
*	update changelogs for Debian builddebian/0.9+2+g97f4f2e	Bdale Garbee	2011-01-19
\|
*	update changelogs for Debian build	Bdale Garbee	2011-01-19
\|
*	update changelogs for Debian builddebian/0.8.1+81+g4ae724f	Bdale Garbee	2011-01-18
\|
*	update changelogs for Debian builddebian/0.8.1+79+g9a5666f	Bdale Garbee	2011-01-18
\|
*	update changelogs for Debian builddebian/0.8.1+71+gda42f40	Bdale Garbee	2011-01-18
\|
*	update changelogs for Debian builddebian/0.8.1+42+g646e192	Bdale Garbee	2011-01-14
\|
*	update changelogs for Debian builddebian/0.8.1+41+gd908c2e	Bdale Garbee	2011-01-14
\|
*	update changelogs for Debian builddebian/0.8.1+37+g97b1ca9	Bdale Garbee	2011-01-14
\|
*	update changelogs for Debian builddebian/0.8.1+36+gd794ef9	Bdale Garbee	2011-01-14
\|
*	update changelogs for Debian builddebian/0.8.1+18+g408a3e0	Bdale Garbee	2011-01-07
\|
*	update changelogs for Debian builddebian/0.8.1+4+gea95c06	Bdale Garbee	2010-12-01
\|
*	update changelogs for Debian builddebian/0.8.1+2+gea7130e	Bdale Garbee	2010-12-01
\|
*	update changelogs for Debian builddebian/0.8.1	Bdale Garbee	2010-11-29
\|
*	update changelogs for Debian builddebian/0.8	Bdale Garbee	2010-11-28
\|
*	update changelogs for Debian build	Bdale Garbee	2010-11-28
\|
*	update changelogs for Debian build	Bdale Garbee	2010-11-28
\|
*	update changelogs for Debian builddebian/0.7.1+168+gcb08bc2	Bdale Garbee	2010-11-25
\|
*	update changelogs for Debian builddebian/0.7.1+36+g811ced6	Bdale Garbee	2010-10-06
\|
*	update changelogs for Debian builddebian/0.7.1+32+g8103432	Bdale Garbee	2010-10-06
\|
*	update changelogs for Debian builddebian/0.7.1+31+g635066c	Bdale Garbee	2010-10-06
\|
*	update changelogs for Debian builddebian/0.7.1+30+g4396aaa	Bdale Garbee	2010-10-06
\|
*	update changelogs for Debian builddebian/0.7.1+28+gd8a2f4c	Bdale Garbee	2010-10-06
\|
*	update changelogs for Debian builddebian/0.7.1	Bdale Garbee	2010-09-10
\|
*	update changelogs for Debian build	Bdale Garbee	2010-09-09
\|
*	update changelogs for Debian build	Bdale Garbee	2010-09-09
\|
*	update changelogs for Debian builddebian/0.7+96+g48f5799	Bdale Garbee	2010-09-09
\|