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)
commitf860b2fb89e358b58b2c875676d3c360e232e449
treef176920019a1919073918acb2c96be1f89ec7d8d
parent5638178b395402ec2c24a3bc362f1f6e6e97c16a
parent7010c9d8c87f593ea787aab1891b9d7eeb51d171
Merge remote branch 'pu/new-style_attributes' into wip

Conflicts:
src/parser/parser_tables.nit
src/parser/table_nit.c
src/parser/parser.nit
src/parser/parser_prod.nit
src/parser/tables_nit.c