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

nitlanguage / nit.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b0c86fc 6f6b746)

author	Jean Privat <jean@pryen.org>
	Mon, 16 Apr 2012 13:19:10 +0000 (09:19 -0400)
committer	Jean Privat <jean@pryen.org>
	Mon, 16 Apr 2012 13:19:10 +0000 (09:19 -0400)
commit	9e438e6419db6dc8d470d3efba0567e6e3eccd7e
tree	838b9ddff1b270c09685cdb18f4fa5ad6f31bfae	tree \| snapshot
parent	b0c86fc43f477b267da8820bed8789cfe03314cf	commit \| diff
parent	6f6b74630a4ce9859b3c5a75fc2895354fe4d36a	commit \| diff

Merge remote branch 'alexis/wip'

Conflicts:
c_src/exec._nitni.h
c_src/file._nitni.h
c_src/math._nitni.h
c_src/stream._nitni.h
c_src/string._nitni.h
c_src/time._nitni.h

bin/gccx	diff1 \|	diff2 \|	blob \| history
lib/standard/file.nit	diff1 \|	diff2 \|	blob \| history
lib/standard/file_nit.h	diff1 \|	diff2 \|	blob \| history
src/native_interface/frontier.nit	diff1 \|	diff2 \|	blob \| history
src/nitc.nit	diff1 \|	diff2 \|	blob \| history
src/syntax/mmbuilder.nit	diff1 \|	diff2 \|	blob \| history

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