nitlanguage / nit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a7613d0 9c57fa6)
Merge remote-tracking branch 'origin/master' into init_auto
authorJean Privat <jean@pryen.org>
Thu, 30 Jun 2016 18:15:25 +0000 (14:15 -0400)
committerJean Privat <jean@pryen.org>
Thu, 30 Jun 2016 18:15:25 +0000 (14:15 -0400)
commit93582db8a72ed0dc8662f6fb57feda89a284ad57
tree0fa1141929e9210aea930c477711f30b7b8971a5tree | snapshot
parenta7613d08d2fddf71ce954e7cb441ba6274d5f43fcommit | diff
parent9c57fa653e80b91264a8f48fc8f1db62db129bb8commit | diff
Merge remote-tracking branch 'origin/master' into init_auto

# Conflicts:
# tests/sav/base_init_basic_alt3.res
# tests/sav/base_init_super_call2_alt3.res
# tests/sav/base_init_super_call2_alt6.res
# tests/sav/error_class_glob.res
# tests/sav/nitdoc_args4.res
# tests/sav/nitlight_args1.res
# tests/sav/nitmetrics_args1.res
# tests/sav/nituml_args3.res
# tests/sav/nituml_args4.res
# tests/sav/test_highlight_args1.res
15 files changed:
src/compiler/abstract_compiler.nit diff1 | diff2 | blob | history
src/doc/html_templates/model_html.nit diff1 | diff2 | blob | history
src/interpreter/naive_interpreter.nit diff1 | diff2 | blob | history
src/model/model.nit diff1 | diff2 | blob | history
src/modelize/modelize_property.nit diff1 | diff2 | blob | history
src/rapid_type_analysis.nit diff1 | diff2 | blob | history
src/semantize/typing.nit diff1 | diff2 | blob | history
tests/sav/base_init_basic_alt3.res diff1 | diff2 | blob | history
tests/sav/nitdoc_args4.res diff1 | diff2 | blob | history
tests/sav/nitlight_args1.res diff1 | diff2 | blob | history
tests/sav/nitmetrics_args1.res diff1 | diff2 | blob | history
tests/sav/nituml_args3.res diff1 | diff2 | blob | history
tests/sav/nituml_args4.res diff1 | diff2 | blob | history
tests/sav/test_highlight_args1.res diff1 | diff2 | blob | history
tests/sav/test_model_visitor_args1.res diff1 | diff2 | blob | history
Nit language project; an oo programing language and its tool suite.