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

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

projects / factor.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6792ff7 01a869c)

author	Slava Pestov <slava@slava-pestovs-macbook-pro.local>
	Sat, 6 Sep 2008 00:48:44 +0000 (19:48 -0500)
committer	Slava Pestov <slava@slava-pestovs-macbook-pro.local>
	Sat, 6 Sep 2008 00:48:44 +0000 (19:48 -0500)
commit	bcc8483b5b337289b819977275f79b5a0b84bfed
tree	a9a1622152e41a1bc99d24c4a014c2f124fa3a2c	tree \| snapshot
parent	6792ff748e32a4c1008481df80253779eb5165bc	commit \| diff
parent	01a869cffec4cf525d9567a4add8fda816e90deb	commit \| diff

Move match to basis since compiler.tree.debugger uses it, fix conflict

18 files changed:

basis/checksums/sha1/sha1.factor	diff1 \|	diff2 \|	blob \| history
basis/match/authors.txt	\|	\|	blob
basis/match/match-docs.factor	\|	\|	blob
basis/match/match-tests.factor	\|	\|	blob
basis/match/match.factor	\|	\|	blob
basis/match/summary.txt	\|	\|	blob
basis/match/tags.txt	\|	\|	blob
basis/tools/scaffold/scaffold.factor	diff1 \|	diff2 \|	blob \| history
core/sequences/sequences-docs.factor	diff1 \|	diff2 \|	blob \| history
core/sequences/sequences-tests.factor	diff1 \|	diff2 \|	blob \| history
core/sequences/sequences.factor	diff1 \|	diff2 \|	blob \| history
extra/match/authors.txt	blob1 \|	blob2 \|	history
extra/match/match-docs.factor	blob1 \|	blob2 \|	history
extra/match/match-tests.factor	blob1 \|	blob2 \|	history
extra/match/match.factor	blob1 \|	blob2 \|	history
extra/match/summary.txt	blob1 \|	blob2 \|	history
extra/match/tags.txt	blob1 \|	blob2 \|	history
extra/pack/pack.factor	diff1 \|	diff2 \|	blob \| history

Factor programming language