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 |
||
|---|---|---|
| .. | ||
| ffi | ||
| GLib-2.0.gir | ||
| authors.txt | ||
| glib.factor | ||
| summary.txt | ||
| tags.txt | ||