]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' of git://factorcode.org/git/factor
authorEduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Tue, 1 Apr 2008 01:42:21 +0000 (19:42 -0600)
committerEduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Tue, 1 Apr 2008 01:42:21 +0000 (19:42 -0600)
commit4f07aefc9717e7677ea1d6b17813f1222a8eabce
tree2f61e3361f58a3c67d0a94e98241622b425f87d5
parente75222d039076608fee57a25b5a7fefefdd1a5c5
parent8e2c2e183818b889aae66617c17b60013c326b56
Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:

core/classes/tuple/tuple.factor
core/classes/tuple/tuple.factor
core/slots/slots.factor
extra/help/markup/markup.factor
extra/peg/peg.factor