Fixed bad merge
authorBart Polot <bart@net.in.tum.de>
Fri, 2 Sep 2011 20:03:13 +0000 (20:03 +0000)
committerBart Polot <bart@net.in.tum.de>
Fri, 2 Sep 2011 20:03:13 +0000 (20:03 +0000)
commitdc35fb3ef01e26eb7a69fdfcafd4632fb1493908
treebc46ae7bc5de9f0e1d1591cc7dc14da995d4f522
parent0ee1339afc5c5e1105e234b6840c87df58a01f2c
Fixed bad merge
src/mesh/mesh_api_new.c