Merge remote branch 'pu/new-style_attributes' into wip
authorJean Privat <jean@pryen.org>
Tue, 25 Jan 2011 01:07:30 +0000 (20:07 -0500)
committerJean Privat <jean@pryen.org>
Tue, 25 Jan 2011 01:07:30 +0000 (20:07 -0500)
Conflicts:
src/parser/parser_tables.nit
src/parser/table_nit.c


No differences found