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: b4b5952 a66f767)

author	Slava Pestov <slava@factorcode.org>
	Sun, 6 Jan 2008 17:30:23 +0000 (13:30 -0400)
committer	Slava Pestov <slava@factorcode.org>
	Sun, 6 Jan 2008 17:30:23 +0000 (13:30 -0400)
commit	8285eeda9a01b762673dfe038738506fe934d441
tree	f9fdc8c974d4bd018be9d9b50f71574611baa31b	tree \| snapshot
parent	b4b59521c7fda256ca41acee891004050d241c6b	commit \| diff
parent	a66f7672dc93879b39ee13baf1626f7d91914576	commit \| diff

Fix conflict

14 files changed:

core/bootstrap/stage2.factor	diff1 \|	diff2 \|	blob \| history
core/classes/classes-docs.factor	diff1 \|	diff2 \|	blob \| history
core/sequences/sequences.factor	diff1 \|	diff2 \|	blob \| history
extra/assoc-heaps/assoc-heaps.factor	\|	diff2 \|	blob \| history
extra/fjsc/fjsc.factor	diff1 \|	diff2 \|	blob \| history
extra/hello-world/deploy.factor	diff1 \|	diff2 \|	blob \| history
extra/http/http.factor	diff1 \|	diff2 \|	blob \| history
extra/peg/search/search-docs.factor	\|	diff2 \|	blob \| history
extra/peg/search/search-tests.factor	\|	diff2 \|	blob \| history
extra/peg/search/search.factor	\|	diff2 \|	blob \| history
extra/sequences/lib/lib.factor	diff1 \|	diff2 \|	blob \| history
extra/tools/deploy/windows/windows.factor	diff1 \|	diff2 \|	blob \| history
extra/xml/utilities/utilities.factor	diff1 \|	diff2 \|	blob \| history
misc/factor.sh	diff1 \|	diff2 \|	blob \| history

Factor programming language