merge changeset 9346 in the 4.2 branches
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 14 May 2008 12:25:29 +0000 (12:25 +0000)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 14 May 2008 12:25:29 +0000 (12:25 +0000)
commitb751b97183e635f791934c4d9cfa1000130b0a6a
tree8116af7a040311688faab1954b4290bfff3b3275
parentefe5ae86445abdc7da3ce5dc083707aa6983f1a8
merge changeset 9346 in the 4.2 branches
doc/Makefile
doc/NMAPI.xml.in [moved from doc/NMAPI.xml with 98% similarity]