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

author	Philipp Brüschweiler <blei42@gmail.com>
	Sat, 12 Jun 2010 14:02:22 +0000 (16:02 +0200)
committer	Philipp Brüschweiler <blei42@gmail.com>
	Sat, 12 Jun 2010 14:02:22 +0000 (16:02 +0200)
commit	5b8543b352d7f05cc09875dcc9e0476ada954f3b
tree	edc7f587015b1ff5af41b237881f2d01d4e1c543	tree \| snapshot
parent	4ce4b2c257a5a9dc5362f5109f68bee0e2fc1785	commit \| diff
parent	b9a5b0c16e6c9ac4eb032bee81364d3957ab2e5e	commit \| diff

Merge remote branch 'ex-rzr/master' into gtk

Conflicts:
basis/ui/backend/gtk/gtk.factor