Merge remote branch 'alexandre/master'
authorJean Privat <jean@pryen.org>
Fri, 7 Dec 2012 21:15:04 +0000 (16:15 -0500)
committerJean Privat <jean@pryen.org>
Fri, 7 Dec 2012 21:15:04 +0000 (16:15 -0500)
1  2 
src/global_compiler.nit
src/model/model.nit
tests/sav/nitg.res

Simple merge
Simple merge
Simple merge