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

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

author	slava <slava@slava-laptop.(none)>
	Tue, 3 Feb 2009 06:27:34 +0000 (00:27 -0600)
committer	slava <slava@slava-laptop.(none)>
	Tue, 3 Feb 2009 06:27:34 +0000 (00:27 -0600)
commit	e29f18a2f487b8f1e72ea7b46fd2a36ff7d2c9eb
tree	20c9a8a92431356dfe6c6b5f160a5020415e5caf	tree \| snapshot
parent	da639739bd2ef313737f01ff5e42b28cdbe6c9a9	commit \| diff

Trying to fix a bad merge...

Revert "Merge branch 'master' of git://factorcode.org/git/factor"

This reverts commit da639739bd2ef313737f01ff5e42b28cdbe6c9a9, reversing
changes made to 346a61f4978049689012e9fa84a893d4fa5234cf.

32 files changed:

basis/alien/structs/structs.factor		diff \| blob \| history
basis/biassocs/biassocs-docs.factor		diff \| blob \| history
basis/compiler/tree/normalization/introductions/introductions.factor		diff \| blob \| history
basis/compiler/tree/normalization/normalization.factor		diff \| blob \| history
basis/interval-maps/interval-maps-docs.factor		diff \| blob \| history
basis/io/encodings/chinese/chinese-docs.factor	[deleted file]	blob \| history
basis/io/encodings/chinese/chinese-tests.factor	[deleted file]	blob \| history
basis/io/encodings/chinese/chinese.factor	[deleted file]	blob \| history
basis/io/encodings/chinese/gb-18030-2000.xml	[deleted file]	blob \| history
basis/io/encodings/iana/iana.factor		diff \| blob \| history
basis/io/encodings/japanese/CP932.TXT	[deleted file]	blob \| history
basis/io/encodings/japanese/CP932.txt	[new file with mode: 0644]	blob
basis/io/encodings/japanese/japanese-docs.factor		diff \| blob \| history
basis/io/encodings/japanese/japanese.factor		diff \| blob \| history
basis/stack-checker/branches/branches.factor		diff \| blob \| history
basis/tools/disassembler/udis/udis.factor		diff \| blob \| history
basis/wrap/wrap-tests.factor	[new file with mode: 0644]	blob
basis/wrap/wrap.factor		diff \| blob \| history
basis/xml/writer/writer.factor		diff \| blob \| history
core/io/encodings/encodings-docs.factor		diff \| blob \| history
extra/project-euler/008/008.factor		diff \| blob \| history
extra/project-euler/011/011.factor		diff \| blob \| history
extra/project-euler/044/044.factor		diff \| blob \| history
extra/project-euler/056/056.factor		diff \| blob \| history
extra/quadtrees/authors.txt	[new file with mode: 0644]	blob
extra/quadtrees/quadtrees-docs.factor	[new file with mode: 0644]	blob
extra/quadtrees/quadtrees-tests.factor	[new file with mode: 0644]	blob
extra/quadtrees/quadtrees.factor	[new file with mode: 0644]	blob
extra/quadtrees/summary.txt	[new file with mode: 0644]	blob
extra/quadtrees/tags.txt	[new file with mode: 0644]	blob
extra/sequences/modified/modified.factor		diff \| blob \| history
extra/tetris/tetromino/tetromino.factor		diff \| blob \| history

Factor programming language

RSS Atom