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

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

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

Conflicts:
basis/locals/locals.factor
basis/peg/peg.factor
extra/infix/infix.factor

Factor programming language

basis/alien/fortran/fortran.factor	diff1 \|	diff2 \|	blob \| history
basis/functors/functors.factor	diff1 \|	diff2 \|	blob \| history
basis/io/encodings/gb18030/gb18030.factor	diff1 \|	diff2 \|	blob \| history
basis/locals/locals.factor	diff1 \|	diff2 \|	blob \| history
basis/locals/rewrite/sugar/sugar.factor	diff1 \|	diff2 \|	blob \| history
basis/math/vectors/conversion/conversion.factor	diff1 \|	diff2 \|	blob \| history
basis/peg/ebnf/ebnf.factor	diff1 \|	diff2 \|	blob \| history
basis/peg/peg.factor	diff1 \|	diff2 \|	blob \| history
extra/decimals/decimals.factor	diff1 \|	diff2 \|	blob \| history
extra/infix/infix.factor	diff1 \|	diff2 \|	blob \| history