gitweb.factorcode.org Git - factor.git/commit - basis/windows/privileges/privileges.factor

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

author	Joe Groff <arcata@gmail.com>
	Sat, 27 Aug 2011 21:07:18 +0000 (14:07 -0700)
committer	Joe Groff <arcata@gmail.com>
	Sat, 27 Aug 2011 21:07:18 +0000 (14:07 -0700)
commit	9040ee37e0a7df8e1e6df67137dba6f8b38a94b1
tree	a1cfb3e98604d1d7d1748731d4068e25aa08ea5f	tree \| snapshot
parent	3616f932508856a576acb0ebeaade8f241d95756	commit \| diff
parent	b58c93ddbdb65679199ce97f54eabd11eebb80d6	commit \| diff

Merge remote-tracking branch 'Blei/gtk-image-loader'

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

Factor programming language

RSS Atom

basis/gdk/pixbuf/ffi/ffi.factor	diff1 \|	diff2 \|	blob \| history
basis/glib/ffi/ffi.factor	diff1 \|	diff2 \|	blob \| history
basis/images/images.factor	diff1 \|	diff2 \|	blob \| history
basis/tools/deploy/shaker/shaker.factor	diff1 \|	diff2 \|	blob \| history
basis/ui/backend/gtk/gtk.factor	diff1 \|	diff2 \|	blob \| history
basis/windows/com/com.factor	diff1 \|	diff2 \|	blob \| history
core/vocabs/loader/loader-docs.factor	diff1 \|	diff2 \|	blob \| history