git.gag.com Git - fw/altos/commitdiff

projects / fw / altos / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1bd781d 5158493)

author	Bdale Garbee <bdale@gag.com>
	Thu, 25 Aug 2011 06:34:49 +0000 (00:34 -0600)
committer	Bdale Garbee <bdale@gag.com>
	Thu, 25 Aug 2011 06:34:49 +0000 (00:34 -0600)

Conflicts:
doc/altusmetrum.xsl

		1	2
doc/altusmetrum.xsl	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge

AltOS - the operating system for Altus Metrum products