OSDN Git Service

Merge branch 'node'
authormzp <mzpppp@gmail.com>
Mon, 24 Nov 2008 05:27:49 +0000 (14:27 +0900)
committermzp <mzpppp@gmail.com>
Mon, 24 Nov 2008 05:27:49 +0000 (14:27 +0900)
commit2071b02a933f22d353c0e7700c88eac7c7b44d66
tree3b7ec9ca45b0089b946879bdd9553271576e18c3
parent532f4e81b665da6a792c5e4f179accb9b5ab5cf0
parent0d842eaa1a2236c9dcdd5be6b124641ab8584a71
Merge branch 'node'

Conflicts:

test/test_node.ml
src/OMakefile
test/OMakefile