Merge origin/master to prepare the integration
authorJean Privat <jean@pryen.org>
Wed, 26 Mar 2014 00:46:23 +0000 (20:46 -0400)
committerJean Privat <jean@pryen.org>
Wed, 26 Mar 2014 00:59:11 +0000 (20:59 -0400)
commit9c3be1576b67bfab10bd8203127415939210871f
tree4e5afb450f40c1100736560ffaa937a01c6f5d7e
parent4919d86f42ce6481bd2fb3bedaa7845d5f03af05
parent6e8279f54c4ddd4e9866e942f0c831aff5cc119f
Merge origin/master to prepare the integration

Conflicts:
lib/standard/file.nit
13 files changed:
lib/standard/file.nit
lib/standard/stream.nit
lib/standard/string.nit
src/global_compiler.nit
src/metrics/generate_hierarchies.nit
src/metrics/model_hyperdoc.nit
src/model/model.nit
src/naive_interpreter.nit
src/network_debugger.nit
src/nitdbg_client.nit
src/nitdoc.nit
src/nitx.nit
src/separate_compiler.nit