]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' into xml
authorDaniel Ehrenberg <ehrenbed@carleton.edu>
Wed, 19 Dec 2007 17:40:55 +0000 (12:40 -0500)
committerDaniel Ehrenberg <ehrenbed@carleton.edu>
Wed, 19 Dec 2007 17:40:55 +0000 (12:40 -0500)
commitb8f210a3be503acac747b799341e6bbb163a3dfb
treec12caadf5bac5e8c2e55a4092fe8cdca14f0508a
parentfa5b1edca2aaaefe11017070fdb1e2e4b4001644
parent58a0dff77c475982b13875d4d7334a45fceb50f9
Merge branch 'master' into xml

Conflicts:

extra/rss/rss.factor
extra/sequences/lib/lib.factor
extra/xml/data/data.factor
extra/delegate/delegate.factor
extra/rss/rss.factor
extra/sequences/lib/lib.factor
extra/xml/data/data.factor