Timestamp:
Nov 28, 2009, 3:48:41 PM (16 years ago)
Author:
Frederik Heber <heber@…>
Children:
f4df97
Parents:
2dff2d (diff), ea3627 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'FixDegeneratedTesselation' into CorrectDegeneratedPolygons

Conflicts:

molecuilder/src/tesselation.cpp

merge only necessary due to stupid git commit --amend

Signed-off-by: Frederik Heber <heber@…>

(No files)

Note: See TracChangeset for help on using the changeset viewer.