Merge branch 'master' into netgen-1.5
This commit is contained in:
commit
48ed1f7583
|
|
@ -7204,8 +7204,6 @@ int EquivalenceClasses(char *name1, int file1, char *name2, int file2, int douni
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TCL_NETGEN
|
|
||||||
|
|
||||||
/*----------------------------------------------------------------------*/
|
/*----------------------------------------------------------------------*/
|
||||||
/* Callback function used by MatchPins */
|
/* Callback function used by MatchPins */
|
||||||
/*----------------------------------------------------------------------*/
|
/*----------------------------------------------------------------------*/
|
||||||
|
|
@ -8412,6 +8410,8 @@ void FlattenCurrent()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef TCL_NETGEN
|
||||||
|
|
||||||
/*------------------------------------------------------*/
|
/*------------------------------------------------------*/
|
||||||
/* Handler is only used when netgen is run from a */
|
/* Handler is only used when netgen is run from a */
|
||||||
/* terminal, not the Tk console. */
|
/* terminal, not the Tk console. */
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue