]> gitweb.factorcode.org Git - factor.git/history - basis/locals/rewrite/point-free/point-free.factor
Conflict resolution
[factor.git] / basis / locals / rewrite / point-free / point-free.factor
2008-12-18 Jose A. Ortega RuizConflict resolution
2008-12-18 Doug ColemanMerge branch 'master' of git://factorcode.org/git/factor
2008-12-18 Slava PestovRemove >r/r>
2008-12-10 Doug ColemanMerge branch 'master' of git://repo.or.cz/factor/jcg
2008-12-09 Slava PestovFix conflict
2008-12-09 Slava PestovMerge branch 'emacs' of http://git.hacks-galore.org...
2008-12-09 John BenediktssonMerge branch 'master' of git://factorcode.org/git/factor
2008-12-09 Slava PestovMerge branch 'master' of git://factorcode.org/git/factor
2008-12-09 Slava Pestov:> now works
2008-12-09 Slava PestovMerge branch 'untangle'
2008-12-08 Slava PestovFix locals conflict
2008-12-06 Slava Pestov:> word work in progress, split up llocals