gitweb.factorcode.org Git - factor.git/commit

author	John Benediktsson <mrjbq7@gmail.com>
	Wed, 13 Apr 2011 01:09:36 +0000 (18:09 -0700)
committer	John Benediktsson <mrjbq7@gmail.com>
	Wed, 13 Apr 2011 01:09:36 +0000 (18:09 -0700)
commit	eb6c986cd6bc245dfd3fdda539ed16f5cfb1ef63
tree	320b9ea17ce423748dda63c3c14c521dfa566276	tree \| snapshot
parent	d58bc08aa08980ccf23d930a464d3d830ec9b9a1	commit \| diff
parent	9b97f22b9212ee2b9f355bc0d45118c2adf3d326	commit \| diff

Merge branch 'master' into sorting

Conflicts:
basis/heaps/heaps-tests.factor