Merge branch 'pu/qualified-modules' into wip
authorJean Privat <jean@pryen.org>
Thu, 13 Oct 2011 01:31:20 +0000 (21:31 -0400)
committerJean Privat <jean@pryen.org>
Thu, 13 Oct 2011 01:32:54 +0000 (21:32 -0400)
commit25dab168c55fa819168ab03b2807848b3ea397f4
tree450fe9954cf1609861249a6c763efe8c2a246429
parente877f5afb6ee4e41d453bf6bbc83adacc328efe6
parent4d0eedc96e3a8be8b3974db01d2b634fa17a180d
Merge branch 'pu/qualified-modules' into wip

Conflicts:
src/compiling/compiling_global.nit
src/parser/parser_nodes.nit
src/syntax/mmbuilder.nit
src/parser/parser.nit
tests/sav/test_parser_args1.sav
src/compiling/compiling.nit
src/compiling/compiling_global.nit
src/compiling/compiling_icode.nit
src/mmloader.nit
src/parser/parser.nit
src/parser/parser_nodes.nit
src/syntax/mmbuilder.nit
tests/sav/test_parser_args1.sav