mjb/altos, branch debian/1.3-1 AltOS - the operating system for Altus Metrum products https://git.ethernal.org/mjb/altos/atom?h=debian%2F1.3-1 2013-12-19T09:11:15+00:00 un-do gratuitous change 2013-12-19T09:11:15+00:00 Bdale Garbee bdale@gag.com 2013-12-19T09:11:15+00:00 urn:sha1:5979aa36a59ab12cda9840f770f5ded7aece8586 update changelog for Debian build 2013-12-19T09:08:23+00:00 Bdale Garbee bdale@gag.com 2013-12-19T09:08:23+00:00 urn:sha1:8517252e3c86d81e58121407d38e9b01a0eeeb9c Merge branch 'branch-1.3' into debian 2013-12-19T09:04:43+00:00 Bdale Garbee bdale@gag.com 2013-12-19T09:04:43+00:00 urn:sha1:e572092092f06b7bde762ad24cceea32271bfbd2 Conflicts: src/test/Makefile Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos 2013-12-19T09:00:10+00:00 Bdale Garbee bdale@gag.com 2013-12-19T09:00:10+00:00 urn:sha1:27528961457865acc3a38b822268df6d7cb86cfd fix missing newline at end of src/test/Makefile 2013-12-19T08:59:29+00:00 Bdale Garbee bdale@gag.com 2013-12-19T08:58:24+00:00 urn:sha1:4006effc538289c36a1563c1b717231991292c0c altosui: Ship EasyMini firmware too 2013-12-19T08:58:50+00:00 Keith Packard keithp@keithp.com 2013-12-19T08:58:50+00:00 urn:sha1:a31629dfceb5e9cf1d5c654b8bd87d575f73c34b Missing the FIRMWARE_EMINI define left all easy mini firmware out of the distribution Signed-off-by: Keith Packard <keithp@keithp.com> fix missed merge conflict 2013-12-19T08:56:17+00:00 Bdale Garbee bdale@gag.com 2013-12-19T08:56:17+00:00 urn:sha1:cf05119040c45bfd1a0f63fcaae5dcf7a2556639 patches no longer needed 2013-12-19T08:53:11+00:00 Bdale Garbee bdale@gag.com 2013-12-19T08:53:11+00:00 urn:sha1:192791171c93c2008fa11a9f3bf1a2da2e14ea08 update changelog for Debian build 2013-12-19T08:44:49+00:00 Bdale Garbee bdale@gag.com 2013-12-19T08:44:49+00:00 urn:sha1:1efef6b0d06ac6f7d7f3c764fcaca8208dff97dc Merge branch 'branch-1.3' into debian 2013-12-19T08:38:40+00:00 Bdale Garbee bdale@gag.com 2013-12-19T08:38:40+00:00 urn:sha1:575bbaf976c5840fd0e308549c45a466fdec1352 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