nitlanguage.org >> Repos - nit.git/commit

nitlanguage / nit.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 98bb9e8 32b4989)

author	Jean Privat <jean@pryen.org>
	Wed, 15 Feb 2012 21:07:31 +0000 (16:07 -0500)
committer	Jean Privat <jean@pryen.org>
	Wed, 15 Feb 2012 21:07:31 +0000 (16:07 -0500)
commit	61b4c26d9fa8bdd76965322d71a8c64411beecd6
tree	cb9ed168e3488edcc4a90711648848aea2dbc01a	tree \| snapshot
parent	98bb9e801bea9bd45a00b86ead6b5537e5ff2790	commit \| diff
parent	32b498994f5e754a29383f3380887b08232aa314	commit \| diff

Merge branch 'ni' into wip

Conflict: use c_src of ni

14 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
lib/standard/exec_nit.h	diff1 \|	diff2 \|	blob \| history
lib/standard/file.nit	diff1 \|	diff2 \|	blob \| history
lib/standard/kernel.nit	diff1 \|	diff2 \|	blob \| history
src/analysis/inline_get_and_set.nit	diff1 \|	diff2 \|	blob \| history
src/compiling/compiling.nit	diff1 \|	diff2 \|	blob \| history
src/compiling/compiling_base.nit	diff1 \|	diff2 \|	blob \| history
src/compiling/compiling_icode.nit	diff1 \|	diff2 \|	blob \| history
src/icode/icode_base.nit	diff1 \|	diff2 \|	blob \| history
src/metamodel/inheritance.nit	diff1 \|	diff2 \|	blob \| history
src/nitc.nit	diff1 \|	diff2 \|	blob \| history
src/syntax/icode_generation.nit	diff1 \|	diff2 \|	blob \| history
src/syntax/mmbuilder.nit	diff1 \|	diff2 \|	blob \| history
src/syntax/syntax_base.nit	diff1 \|	diff2 \|	blob \| history

Nit language project; an oo programing language and its tool suite.