Merge branch 'ntd'
commit0a0d606dd8c29c851a01d89dabce0c90e1fe9917
authorNicola Fontana <ntd@entidi.it>
Sat, 10 Jan 2009 19:48:32 +0000 (10 20:48 +0100)
committerNicola Fontana <ntd@entidi.it>
Sat, 10 Jan 2009 19:48:32 +0000 (10 20:48 +0100)
treee19865e705638247083b57d958af8f2b780deea9
parentcd9ffbaf286177b56f49bd5a8f1e0ab7a67b4393
parent7537f19da6002158ce92b00ee976dbd149cfc6a1
Merge branch 'ntd'

Conflicts:

adg/adg-path-private.h
adg/adg-path.c
adg/adg-path.h
demo/adg-demo.c
demo/ldim.c
adg/adg-entity.h
demo/adg-demo.c
demo/ldim.c