Merge branch 'nitdoc2' into wip
authorJean Privat <jean@pryen.org>
Wed, 15 Feb 2012 21:06:09 +0000 (16:06 -0500)
committerJean Privat <jean@pryen.org>
Wed, 15 Feb 2012 21:06:09 +0000 (16:06 -0500)
commit98bb9e801bea9bd45a00b86ead6b5537e5ff2790
tree453d98301f24837ded6f0ef6f9e4b689a9f46b7f
parent47064b5bb1464a062922d635116c4db9d4a3b758
parenta0de25830949bddffaeae73db2615a1496a32b61
Merge branch 'nitdoc2' into wip

Conflicts:
lib/standard/file.nit
src/nitdoc.nit
lib/standard/file.nit
lib/standard/string_search.nit
src/compiling/compiling_base.nit
src/metamodel/inheritance.nit
src/program.nit
src/syntax/mmbuilder.nit