]> gitweb.factorcode.org Git - factor.git/commit
projects / factor.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ed65e2a 1c42ebd)
Merge branch 'inlinec' into marshall
authorJeremy Hughes <jedahu@gmail.com>
Tue, 7 Jul 2009 21:46:52 +0000 (09:46 +1200)
committerJeremy Hughes <jedahu@gmail.com>
Tue, 7 Jul 2009 21:46:52 +0000 (09:46 +1200)
commit03d4575b90f948178dba70aae36c54964b2a8f74
treee5a52153a52b48d77923bd9ed4d78e8c22de834btree | snapshot
parented65e2ae4c386851cf365bb53ba4de9f1db676c7commit | diff
parent1c42ebd89e2182482109e219fe8926d293a49003commit | diff
Merge branch 'inlinec' into marshall

* inlinec:
  alien.inline: allow compiling from non-file vocabs
  alien.inline: added DELETE-C-LIBRARY: word, mainly for tests
  alien.inline: prepend vocab name to c-library name

Conflicts:
basis/alien/inline/inline.factor
basis/alien/inline/inline.factor diff1 | diff2 | blob | history
Factor programming language