Merge branch 'annotations'
authorJean Privat <jean@pryen.org>
Thu, 25 Jul 2013 17:35:38 +0000 (13:35 -0400)
committerJean Privat <jean@pryen.org>
Thu, 25 Jul 2013 17:35:38 +0000 (13:35 -0400)
commitd28c34cb7ae9e655fa885b58cb97aadd0fb1ad5a
tree201568f596d8ccdaef814a7235bd5b931e0b5611
parent17fca9389befff163372f1c5b893b3748d5a1819
parent63184b6109bf565fb41937e5061946569aa46a50
Merge branch 'annotations'

Conflicts:
src/parser/lexer.nit
src/parser/tables_nit.c
src/parser/lexer.nit
src/parser/nit.sablecc3xx
src/parser/parser.nit
src/parser/parser_abs.nit
src/parser/parser_nodes.nit
src/parser/tables_nit.c