]> gitweb.factorcode.org Git - factor.git/commitdiff
projects / factor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f177a1 3458f8b)
Merge branch 'master' of git://factorcode.org/git/factor
authorDaniel Ehrenberg <littledan@Macintosh-103.local>
Mon, 26 Jan 2009 06:13:58 +0000 (00:13 -0600)
committerDaniel Ehrenberg <littledan@Macintosh-103.local>
Mon, 26 Jan 2009 06:13:58 +0000 (00:13 -0600)
1  2 
basis/syndication/syndication.factor patch | diff1 | diff2 | blob | history
basis/xml/data/data.factor patch | diff1 | diff2 | blob | history

diff --cc basis/syndication/syndication.factor
Simple merge
diff --cc basis/xml/data/data.factor
Simple merge
Factor programming language