<feed xmlns='http://www.w3.org/2005/Atom'>
<title>mjb/altos/ChangeLog, branch debian/1.3-1</title>
<subtitle>AltOS - the operating system for Altus Metrum products
</subtitle>
<id>https://git.ethernal.org/mjb/altos/atom?h=debian%2F1.3-1</id>
<link rel='self' href='https://git.ethernal.org/mjb/altos/atom?h=debian%2F1.3-1'/>
<link rel='alternate' type='text/html' href='https://git.ethernal.org/mjb/altos/'/>
<updated>2013-12-19T08:56:17+00:00</updated>
<entry>
<title>fix missed merge conflict</title>
<updated>2013-12-19T08:56:17+00:00</updated>
<author>
<name>Bdale Garbee</name>
<email>bdale@gag.com</email>
</author>
<published>2013-12-19T08:56:17+00:00</published>
<link rel='alternate' type='text/html' href='https://git.ethernal.org/mjb/altos/commit/?id=cf05119040c45bfd1a0f63fcaae5dcf7a2556639'/>
<id>urn:sha1:cf05119040c45bfd1a0f63fcaae5dcf7a2556639</id>
<content type='text'>
</content>
</entry>
<entry>
<title>Merge branch 'branch-1.3' into debian</title>
<updated>2013-12-19T08:38:40+00:00</updated>
<author>
<name>Bdale Garbee</name>
<email>bdale@gag.com</email>
</author>
<published>2013-12-19T08:38:40+00:00</published>
<link rel='alternate' type='text/html' href='https://git.ethernal.org/mjb/altos/commit/?id=575bbaf976c5840fd0e308549c45a466fdec1352'/>
<id>urn:sha1:575bbaf976c5840fd0e308549c45a466fdec1352</id>
<content type='text'>
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
</content>
</entry>
<entry>
<title>update ChangeLog from git</title>
<updated>2013-12-19T08:29:55+00:00</updated>
<author>
<name>Bdale Garbee</name>
<email>bdale@gag.com</email>
</author>
<published>2013-12-19T08:29:55+00:00</published>
<link rel='alternate' type='text/html' href='https://git.ethernal.org/mjb/altos/commit/?id=bc3610d8cecbfed40c62d4dcb93fc9a4d2a7c9e3'/>
<id>urn:sha1:bc3610d8cecbfed40c62d4dcb93fc9a4d2a7c9e3</id>
<content type='text'>
</content>
</entry>
<entry>
<title>update Changelog for 1.2.1 release, again</title>
<updated>2013-05-21T15:32:22+00:00</updated>
<author>
<name>Bdale Garbee</name>
<email>bdale@gag.com</email>
</author>
<published>2013-05-21T15:32:22+00:00</published>
<link rel='alternate' type='text/html' href='https://git.ethernal.org/mjb/altos/commit/?id=a261bdbba3301cd29c1be7ba85f695f7b434cb03'/>
<id>urn:sha1:a261bdbba3301cd29c1be7ba85f695f7b434cb03</id>
<content type='text'>
</content>
</entry>
<entry>
<title>update changelog for 1.2.1 release</title>
<updated>2013-05-21T15:29:30+00:00</updated>
<author>
<name>Bdale Garbee</name>
<email>bdale@gag.com</email>
</author>
<published>2013-05-21T15:29:30+00:00</published>
<link rel='alternate' type='text/html' href='https://git.ethernal.org/mjb/altos/commit/?id=9b138221283f0b8e8df5a799f75d73fd456028a0'/>
<id>urn:sha1:9b138221283f0b8e8df5a799f75d73fd456028a0</id>
<content type='text'>
</content>
</entry>
<entry>
<title>update ChangeLog for release</title>
<updated>2013-05-16T06:34:26+00:00</updated>
<author>
<name>Bdale Garbee</name>
<email>bdale@gag.com</email>
</author>
<published>2013-05-16T06:34:26+00:00</published>
<link rel='alternate' type='text/html' href='https://git.ethernal.org/mjb/altos/commit/?id=7699a55aed3a9a7daeb4c6a5a9a280f43edf455f'/>
<id>urn:sha1:7699a55aed3a9a7daeb4c6a5a9a280f43edf455f</id>
<content type='text'>
</content>
</entry>
<entry>
<title>releasing 1.1.1</title>
<updated>2012-09-16T19:59:21+00:00</updated>
<author>
<name>Bdale Garbee</name>
<email>bdale@gag.com</email>
</author>
<published>2012-09-16T19:59:21+00:00</published>
<link rel='alternate' type='text/html' href='https://git.ethernal.org/mjb/altos/commit/?id=7a0cce7fa0c802b1597fef94cfaf00aa0c28c988'/>
<id>urn:sha1:7a0cce7fa0c802b1597fef94cfaf00aa0c28c988</id>
<content type='text'>
</content>
</entry>
<entry>
<title>releasing 1.1</title>
<updated>2012-09-12T04:17:22+00:00</updated>
<author>
<name>Bdale Garbee</name>
<email>bdale@gag.com</email>
</author>
<published>2012-09-12T04:17:22+00:00</published>
<link rel='alternate' type='text/html' href='https://git.ethernal.org/mjb/altos/commit/?id=3e9078cb1077e7ad0d845f10c2ad0a007df76d29'/>
<id>urn:sha1:3e9078cb1077e7ad0d845f10c2ad0a007df76d29</id>
<content type='text'>
</content>
</entry>
<entry>
<title>update changelogs for Debian build</title>
<updated>2011-08-28T19:39:37+00:00</updated>
<author>
<name>Bdale Garbee</name>
<email>bdale@gag.com</email>
</author>
<published>2011-08-28T19:39:37+00:00</published>
<link rel='alternate' type='text/html' href='https://git.ethernal.org/mjb/altos/commit/?id=5c3a0263d292cb0675f608d0ef085d13e51ce6ba'/>
<id>urn:sha1:5c3a0263d292cb0675f608d0ef085d13e51ce6ba</id>
<content type='text'>
</content>
</entry>
<entry>
<title>update changelogs for Debian build</title>
<updated>2011-08-26T16:39:45+00:00</updated>
<author>
<name>Bdale Garbee</name>
<email>bdale@gag.com</email>
</author>
<published>2011-08-26T16:39:45+00:00</published>
<link rel='alternate' type='text/html' href='https://git.ethernal.org/mjb/altos/commit/?id=01aee9ebe517ed657692e0a39a31ae0ddfb5b8b0'/>
<id>urn:sha1:01aee9ebe517ed657692e0a39a31ae0ddfb5b8b0</id>
<content type='text'>
</content>
</entry>
</feed>
