Conflicts: basis/alien/enums/enums-tests.factor basis/alien/enums/enums.factor basis/alien/parser/parser.factor basis/gdk/pixbuf/ffi/ffi.factor basis/glib/ffi/ffi.factor basis/tools/deploy/shaker/shaker.factor basis/ui/backend/gtk/gtk.factor basis/windows/nt/nt.factor |
||
---|---|---|
.. | ||
loader | ||
parser | ||
authors.txt | ||
summary.txt | ||
vocabs-docs.factor | ||
vocabs-tests.factor | ||
vocabs.factor |